From ae9f68271e671bb87c6cca1086e24128ffcafeb1 Mon Sep 17 00:00:00 2001 From: shikha372 Date: Thu, 11 Jul 2024 22:17:04 -0700 Subject: [PATCH] (eks): fix helm asset snapshot --- .../aws-cdk-eks-helm-test.assets.json | 4 +-- .../aws-cdk-eks-helm-test.template.json | 32 ------------------- .../manifest.json | 17 ++++++---- .../tree.json | 28 ---------------- .../test/aws-eks/test/integ.eks-helm-asset.ts | 11 ------- 5 files changed, 12 insertions(+), 80 deletions(-) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json index 8b758cfa82d6c..c79b72df6b280 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json @@ -118,7 +118,7 @@ } } }, - "87e05e7e56d00f8bd9133b97480ff01b622c9f7f500f8544cef311a412454395": { + "0ab01c1684677dce72948d48cdd47d31aef3137c741b066737be81fe5944e6fe": { "source": { "path": "aws-cdk-eks-helm-test.template.json", "packaging": "file" @@ -126,7 +126,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "87e05e7e56d00f8bd9133b97480ff01b622c9f7f500f8544cef311a412454395.json", + "objectKey": "0ab01c1684677dce72948d48cdd47d31aef3137c741b066737be81fe5944e6fe.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json index 03d07827f9b96..c6fb37da5e966 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json @@ -1134,38 +1134,6 @@ "DeletionPolicy": "Delete" }, "ClustercharttestskipcrdinstallationB8323954": { - "Type": "Custom::AWSCDK-EKS-HelmChart", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B", - "Outputs.awscdkekshelmtestawscdkawseksKubectlProviderframeworkonEvent9D93C644Arn" - ] - }, - "ClusterName": { - "Ref": "Cluster9EE0221C" - }, - "RoleArn": { - "Fn::GetAtt": [ - "ClusterCreationRole360249B6", - "Arn" - ] - }, - "Release": "rds-chart-release", - "Chart": "rds-chart", - "Version": "v1.1.2", - "Namespace": "ack-system", - "Repository": "oci://public.ecr.aws/aws-controllers-k8s/rds-chart", - "CreateNamespace": true, - "SkipCrds": true - }, - "DependsOn": [ - "ClusterKubectlReadyBarrier200052AF" - ], - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "ClustercharttestatomicinstallationB879263E": { "Type": "Custom::AWSCDK-EKS-HelmChart", "Properties": { "ServiceToken": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json index 0abd7f388ac4e..92986a5fcea68 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/87e05e7e56d00f8bd9133b97480ff01b622c9f7f500f8544cef311a412454395.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0ab01c1684677dce72948d48cdd47d31aef3137c741b066737be81fe5944e6fe.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -280,12 +280,6 @@ "data": "ClustercharttestskipcrdinstallationB8323954" } ], - "/aws-cdk-eks-helm-test/Cluster/chart-test-atomic-installation/Resource/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "ClustercharttestatomicinstallationB879263E" - } - ], "/aws-cdk-eks-helm-test/Cluster/chart-test-non-ecr-oci-chart/Resource/Default": [ { "type": "aws:cdk:logicalId", @@ -519,6 +513,15 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } + ], + "ClustercharttestatomicinstallationB879263E": [ + { + "type": "aws:cdk:logicalId", + "data": "ClustercharttestatomicinstallationB879263E", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } ] }, "displayName": "aws-cdk-eks-helm-test" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json index e37cdfc5ebf7d..a260b0b177dc6 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json @@ -1543,34 +1543,6 @@ "version": "0.0.0" } }, - "chart-test-atomic-installation": { - "id": "chart-test-atomic-installation", - "path": "aws-cdk-eks-helm-test/Cluster/chart-test-atomic-installation", - "children": { - "Resource": { - "id": "Resource", - "path": "aws-cdk-eks-helm-test/Cluster/chart-test-atomic-installation/Resource", - "children": { - "Default": { - "id": "Default", - "path": "aws-cdk-eks-helm-test/Cluster/chart-test-atomic-installation/Resource/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_eks.HelmChart", - "version": "0.0.0" - } - }, "chart-test-non-ecr-oci-chart": { "id": "chart-test-non-ecr-oci-chart", "path": "aws-cdk-eks-helm-test/Cluster/chart-test-non-ecr-oci-chart", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts index 2a06da34209f8..7cf67db1e14d2 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts @@ -86,17 +86,6 @@ class EksClusterStack extends Stack { namespace: 'ack-system', createNamespace: true, skipCrds: true, - }); - - //testing installation with atomic flag set to true - this.cluster.addHelmChart('test-atomic-installation', { - chart: 'rds-chart', - release: 'rds-chart-release', - repository: 'oci://public.ecr.aws/aws-controllers-k8s/rds-chart', - version: 'v1.1.2', - namespace: 'ack-system', - createNamespace: true, - skipCrds: true, atomic: true, });