Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(eks): update failing snapshots #30829

Merged
merged 3 commits into from
Jul 24, 2024
Merged

chore(eks): update failing snapshots #30829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
242ff76
update failing snapshots
pahud Jul 11, 2024
3876fbb
Merge branch 'main' into update-eks-integ
pahud Jul 11, 2024
7eb771a
Merge branch 'main' into update-eks-integ
pahud Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...4518518480c0d9fb344a098/apply/__init__.py → ...57f5446c34c22be7e6f7f51/apply/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...f54518518480c0d9fb344a098/get/__init__.py → ...6457f5446c34c22be7e6f7f51/get/__init__.py
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...54518518480c0d9fb344a098/helm/__init__.py → ...457f5446c34c22be7e6f7f51/helm/__init__.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...20557cff54518518480c0d9fb344a098/index.py → ...81c25ea6457f5446c34c22be7e6f7f51/index.py
View file
Open in desktop
File renamed without changes.
0 ...4518518480c0d9fb344a098/patch/__init__.py → ...57f5446c34c22be7e6f7f51/patch/__init__.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...nteg/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 54 additions & 6 deletions ...eg/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,18 @@
"Release": "s3-chart",
"Chart": "s3-chart",
"Version": "v0.1.0",
"Values": {
"Fn::Join": [
"",
[
"{\"aws\":{\"region\":\"",
{
"Ref": "AWS::Region"
},
"\"}}"
]
]
},
"Namespace": "ack-system",
"Repository": "oci://public.ecr.aws/aws-controllers-k8s/s3-chart",
"CreateNamespace": true
Expand Down Expand Up @@ -1123,6 +1135,18 @@
"Release": "lambda-chart-release",
"Chart": "lambda-chart",
"Version": "v0.1.4",
"Values": {
"Fn::Join": [
"",
[
"{\"aws\":{\"region\":\"",
{
"Ref": "AWS::Region"
},
"\"}}"
]
]
},
"Namespace": "ack-system",
"Repository": "oci://public.ecr.aws/aws-controllers-k8s/lambda-chart",
"CreateNamespace": true
Expand Down Expand Up @@ -1153,7 +1177,19 @@
},
"Release": "rds-chart-release",
"Chart": "rds-chart",
"Version": "v1.1.2",
"Version": "1.4.1",
"Values": {
"Fn::Join": [
"",
[
"{\"aws\":{\"region\":\"",
{
"Ref": "AWS::Region"
},
"\"}}"
]
]
},
"Namespace": "ack-system",
"Repository": "oci://public.ecr.aws/aws-controllers-k8s/rds-chart",
"CreateNamespace": true,
Expand Down Expand Up @@ -1183,11 +1219,23 @@
"Arn"
]
},
"Release": "rds-chart-release",
"Chart": "rds-chart",
"Version": "v1.1.2",
"Release": "ec2-chart-release",
"Chart": "ec2-chart",
"Version": "1.2.13",
"Values": {
"Fn::Join": [
"",
[
"{\"aws\":{\"region\":\"",
{
"Ref": "AWS::Region"
},
"\"}}"
]
]
},
"Namespace": "ack-system",
"Repository": "oci://public.ecr.aws/aws-controllers-k8s/rds-chart",
"Repository": "oci://public.ecr.aws/aws-controllers-k8s/ec2-chart",
"CreateNamespace": true,
"SkipCrds": true,
"Atomic": true
Expand Down Expand Up @@ -1298,7 +1346,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/e23ed13a7821108db50050a225f7b03107502f583d2faa3a1f82a71756081a75.json"
"/103a1c2a2539a9843f062d1d618f1fbd8483ea496405f34f6aca5ae90f507af8.json"
]
]
}
Expand Down
2 changes: 1 addition & 1 deletion ...set.js.snapshot/awscdkekshelmtestawscdkawseksKubectlProvider207F42E4.nested.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "abc70c90ded969d12235ca11768293cb20557cff54518518480c0d9fb344a098.zip"
"S3Key": "58216e9cbe7ed5d0c2b7c7d47e173e8f81c25ea6457f5446c34c22be7e6f7f51.zip"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Environment": {
Expand Down
2 changes: 1 addition & 1 deletion ...-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 15 additions & 6 deletions packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ class EksClusterStack extends Stack {
chartAsset: chartAsset,
});

// https://gallery.ecr.aws/aws-controllers-k8s/s3-chart
this.cluster.addHelmChart('test-oci-chart', {
chart: 's3-chart',
release: 's3-chart',
repository: 'oci://public.ecr.aws/aws-controllers-k8s/s3-chart',
version: 'v0.1.0',
namespace: 'ack-system',
createNamespace: true,
values: { aws: { region: this.region } },
});

// there is no opinionated way of testing charts from private ECR, so there is description of manual steps needed to reproduce:
Expand All @@ -68,38 +70,45 @@ class EksClusterStack extends Stack {
// 5. Change `repository` in above test to oci://YOUR_ACCOUNT_ID.dkr.ecr.YOUR_REGION.amazonaws.com/helm-charts-test
// 6. Run integration tests as usual

// https://gallery.ecr.aws/aws-controllers-k8s/lambda-chart
this.cluster.addHelmChart('test-oci-chart-different-release-name', {
chart: 'lambda-chart',
release: 'lambda-chart-release',
repository: 'oci://public.ecr.aws/aws-controllers-k8s/lambda-chart',
version: 'v0.1.4',
namespace: 'ack-system',
createNamespace: true,
values: { aws: { region: this.region } },
});

// testing the disable mechanism of the installation of CRDs
// https://gallery.ecr.aws/aws-controllers-k8s/rds-chart
this.cluster.addHelmChart('test-skip-crd-installation', {
chart: 'rds-chart',
release: 'rds-chart-release',
repository: 'oci://public.ecr.aws/aws-controllers-k8s/rds-chart',
version: 'v1.1.2',
version: '1.4.1',
namespace: 'ack-system',
createNamespace: true,
skipCrds: true,
values: { aws: { region: this.region } },
});

//testing installation with atomic flag set to true
// testing installation with atomic flag set to true
// https://gallery.ecr.aws/aws-controllers-k8s/sns-chart
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',
chart: 'ec2-chart',
release: 'ec2-chart-release',
repository: 'oci://public.ecr.aws/aws-controllers-k8s/ec2-chart',
version: '1.2.13',
namespace: 'ack-system',
createNamespace: true,
skipCrds: true,
atomic: true,
values: { aws: { region: this.region } },
});

// https://github.com/orgs/grafana-operator/packages/container/package/helm-charts%2Fgrafana-operator
this.cluster.addHelmChart('test-non-ecr-oci-chart', {
chart: 'grafana-operator',
release: 'grafana-operator-release',
Expand Down