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

feat(eks): support for Kubernetes version 1.23 #22638

Merged
merged 54 commits into from
Oct 27, 2022
Merged

feat(eks): support for Kubernetes version 1.23 #22638

Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
c93ed9d
fix(eks): kubectl layer must contain AWS CLI
rix0rrr Oct 19, 2022
d1e4a58
Tests
rix0rrr Oct 19, 2022
d184727
Update packages/@aws-cdk/aws-eks/lib/cluster.ts
rix0rrr Oct 19, 2022
3e985be
Snapshots some more
rix0rrr Oct 19, 2022
4c1b57b
Merge branch 'huijbers/eks-separate-awscli-layer' of github.com:aws/a…
rix0rrr Oct 19, 2022
0696a37
Tests
rix0rrr Oct 19, 2022
f1a484a
Snapshots some more
rix0rrr Oct 19, 2022
9892f6a
Update cluster.ts
rix0rrr Oct 20, 2022
e821907
Merge branch 'main' into huijbers/eks-separate-awscli-layer
madeline-k Oct 21, 2022
a0b1d71
feat(eks): support for Kubernetes version 1.22
madeline-k Oct 21, 2022
6ebd1b6
Remove residual integration test files
madeline-k Oct 21, 2022
4e8c7ee
update README and version number
madeline-k Oct 21, 2022
888db08
update readme
madeline-k Oct 21, 2022
b782726
integration tests
madeline-k Oct 25, 2022
7bf6b0d
Merge branch 'main' into madeline-k/kubernetes-v22
madeline-k Oct 25, 2022
11bf39e
feat(eks): support for Kubernetes version 1.23
kaizencc Oct 25, 2022
9f9db94
minor version
kaizencc Oct 25, 2022
67da92b
add latest aws-cdk-lib to devDependencies so it can be used in integr…
madeline-k Oct 25, 2022
cdf5d1d
revert
kaizencc Oct 25, 2022
9d89f1a
Merge branch 'madeline-k/kubernetes-v22' into conroy/kubernetes-v23
kaizencc Oct 25, 2022
bfa8d82
kubectlv23
kaizencc Oct 25, 2022
098af04
Merge branch 'main' into conroy/kubernetes-v23
kaizencc Oct 25, 2022
39fc1ac
revert
kaizencc Oct 25, 2022
b98823f
eks bottlerocket integ snapshot update
kaizencc Oct 25, 2022
9bc19f5
Merge branch 'conroy/kubernetes-v23' of https://github.com/aws/aws-cd…
kaizencc Oct 25, 2022
87dd8dc
unit tests for annotations
kaizencc Oct 25, 2022
9e7169b
update integ tests: integ.eks-helm-asset, integ.eks-cluster-private-e…
madeline-k Oct 26, 2022
6d07cc1
integ tests: integ.fargate-cluster.js, integ.eks-cluster-handlers-vpc.js
madeline-k Oct 26, 2022
083d849
update alb-controller integ test to use cdk8s-plus-23
madeline-k Oct 26, 2022
5360272
fix(eks): kubectl get handler output includes stderr
kaizencc Oct 26, 2022
615e271
Merge branch 'conroy/eks' into conroy/kubernetes-v23
madeline-k Oct 26, 2022
1279bde
re-run integ tests: integ.fargate-cluster, integ.eks-helm-asset, inte…
madeline-k Oct 26, 2022
9b9dec7
alb controller test
kaizencc Oct 26, 2022
1a654de
integ tests: integ.alb-controller, integ.eks-cluster-private-endpoint…
madeline-k Oct 26, 2022
68e8d60
eks cluster private endpoint snapshot
kaizencc Oct 27, 2022
f55ca4a
eks cluster snapshot
kaizencc Oct 27, 2022
bb1819c
eks inference snapshot
kaizencc Oct 27, 2022
bc9b3fc
more tests
madeline-k Oct 27, 2022
5b12477
cleanup integ snapshots
madeline-k Oct 27, 2022
fc3764e
update yarn.lock
madeline-k Oct 27, 2022
9c02969
integ tests: integ.eks-helm-asset integ.eks-bottlerocket-ng
madeline-k Oct 27, 2022
6d961b5
fargate cluster snapshot
kaizencc Oct 27, 2022
cb1b11e
yarn.lock file
kaizencc Oct 27, 2022
cc477ce
Merge branch 'conroy/eks' of https://github.com/aws/aws-cdk into conr…
kaizencc Oct 27, 2022
c3461ba
cluster handlers vpc snapshot
kaizencc Oct 27, 2022
10d85ba
alb controller
kaizencc Oct 27, 2022
b9622a9
Merge branch 'main' into conroy/eks
kaizencc Oct 27, 2022
fbf9939
stepfunctions-tasks snapshot updates
kaizencc Oct 27, 2022
930212d
Merge branch 'conroy/eks' of https://github.com/aws/aws-cdk into conr…
kaizencc Oct 27, 2022
af3362c
Merge branch 'main' into conroy/eks
kaizencc Oct 27, 2022
84c7e9e
Merge branch 'conroy/eks' into conroy/kubernetes-v23
madeline-k Oct 27, 2022
cba6fe2
merge conflicts
madeline-k Oct 27, 2022
6dc385e
Merge branch 'main' into conroy/kubernetes-v23
madeline-k Oct 27, 2022
97281d2
use semver
madeline-k Oct 27, 2022
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
14 changes: 12 additions & 2 deletions packages/@aws-cdk/aws-eks/lib/cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,15 @@ export class KubernetesVersion {
*/
public static readonly V1_22 = KubernetesVersion.of('1.22');

/**
* Kubernetes version 1.23
*
* When creating a `Cluster` with this version, you need to also specify the
* `kubectlLayer` property with a `KubectlV23Layer` from
* `@aws-cdk/lambda-layer-kubectl-v23`.
*/
public static readonly V1_23 = KubernetesVersion.of('1.23');

/**
* Custom cluster version
* @param version custom version number
Expand Down Expand Up @@ -1372,8 +1381,9 @@ export class Cluster extends ClusterBase {
this.prune = props.prune ?? true;
this.vpc = props.vpc || new ec2.Vpc(this, 'DefaultVpc');

if (props.version === KubernetesVersion.V1_22 && !props.kubectlLayer) {
Annotations.of(this).addWarning(`You created a cluster with Kubernetes Version ${props.version} without specifying the kubectlLayer property. This may cause failures as the kubectl version provided with aws-cdk-lib is 1.20, which is only guaranteed to be compatible with Kubernetes versions 1.19-1.21. Please provide a kubectlLayer from @aws-cdk/lambda-layer-kubectl-v22.`);
const kubectlVersion = Number(props.version.version) * 100;
madeline-k marked this conversation as resolved.
Show resolved Hide resolved
if (kubectlVersion >= 122 && !props.kubectlLayer) {
Annotations.of(this).addWarning(`You created a cluster with Kubernetes Version ${props.version.version} without specifying the kubectlLayer property. This may cause failures as the kubectl version provided with aws-cdk-lib is 1.20, which is only guaranteed to be compatible with Kubernetes versions 1.19-1.21. Please provide a kubectlLayer from @aws-cdk/lambda-layer-kubectl-v${kubectlVersion % 100}.`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it that it may cause errors or that it will? If we know it will, I think this should be an error.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not, no issues here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not for certain. In some cases you can use a version of kubectl that is not guaranteed to be compatible with the version of the Kubernetes engine you are using. It just depends on the APIs being used.

};
this.version = props.version;
this.kubectlLambdaRole = props.kubectlLambdaRole ? props.kubectlLambdaRole : undefined;
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-eks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/lambda-layer-kubectl-v22": "2.0.0",
"aws-cdk-lib": "2.47.0",
"@aws-cdk/lambda-layer-kubectl-v23": "^2.0.0",
kaizencc marked this conversation as resolved.
Show resolved Hide resolved
"aws-cdk-lib": "^2.47.0",
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
Expand All @@ -95,7 +95,7 @@
"aws-sdk": "^2.1211.0",
"cdk8s": "^2.5.28",
"cdk8s-plus-21": "^2.0.0-beta.12",
"cdk8s-plus-22": "^2.0.0-rc.158",
"cdk8s-plus-23": "2.0.2",
"jest": "^27.5.1",
"sinon": "^9.2.4"
},
Expand Down
Binary file modified ...integ.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip
View file
Open in desktop
Binary file not shown.
Binary file modified ...integ.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...04c8724dc5c8355b6e124a39af09449a3aa30.zip → ...0d8965ddf70c0e144af871d078fdbddf0a67d.zip
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions ...ks/test/alb-controller.integ.snapshot/aws-cdk-eks-cluster-alb-controller-test.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "21.0.0",
"files": {
"c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30": {
"dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d": {
"source": {
"path": "asset.c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"path": "asset.dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"objectKey": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -144,15 +144,15 @@
}
}
},
"c6b7a3e3c841118ec365de6b3227d6ec23618b7716c20175c7f18822b22fa08d": {
"1e8f5b9efc22fb7df3c3a0e894ec6ddf91d5b71c100c70638ff47b2379c3a749": {
"source": {
"path": "aws-cdk-eks-cluster-alb-controller-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "c6b7a3e3c841118ec365de6b3227d6ec23618b7716c20175c7f18822b22fa08d.json",
"objectKey": "1e8f5b9efc22fb7df3c3a0e894ec6ddf91d5b71c100c70638ff47b2379c3a749.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
6 changes: 3 additions & 3 deletions .../test/alb-controller.integ.snapshot/aws-cdk-eks-cluster-alb-controller-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"S3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"Description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"Description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -608,7 +608,7 @@
]
},
"Config": {
"version": "1.22",
"version": "1.23",
"roleArn": {
"Fn::GetAtt": [
"ClusterRoleFA261979",
Expand Down
7 changes: 5 additions & 2 deletions packages/@aws-cdk/aws-eks/test/alb-controller.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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}/c6b7a3e3c841118ec365de6b3227d6ec23618b7716c20175c7f18822b22fa08d.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1e8f5b9efc22fb7df3c3a0e894ec6ddf91d5b71c100c70638ff47b2379c3a749.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -168,7 +168,10 @@
"/aws-cdk-eks-cluster-alb-controller-test/KubectlLayer/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "KubectlLayer600207B5"
"data": "KubectlLayer600207B5",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a concern?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, a lambda layer is a stateless resource, and we are replacing it with an upgraded version of kubectl. So, the replacement is expected here.

]
}
],
"/aws-cdk-eks-cluster-alb-controller-test/Cluster/Role/Resource": [
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-eks/test/alb-controller.integ.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,9 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"s3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"licenseInfo": "Apache-2.0"
}
},
Expand All @@ -704,7 +704,7 @@
}
},
"constructInfo": {
"fqn": "@aws-cdk/lambda-layer-kubectl-v22.KubectlV22Layer",
"fqn": "@aws-cdk/lambda-layer-kubectl-v23.KubectlV23Layer",
"version": "2.0.0"
}
},
Expand Down
40 changes: 39 additions & 1 deletion packages/@aws-cdk/aws-eks/test/cluster.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as fs from 'fs';
import * as path from 'path';
import { Match, Template } from '@aws-cdk/assertions';
import { Annotations, Match, Template } from '@aws-cdk/assertions';
import * as asg from '@aws-cdk/aws-autoscaling';
import * as ec2 from '@aws-cdk/aws-ec2';
import * as iam from '@aws-cdk/aws-iam';
Expand Down Expand Up @@ -3073,6 +3073,44 @@ describe('cluster', () => {
});
});

describe('kubectlLayer annotation', () => {
function message(version: string) {
return [
'You created a cluster with Kubernetes Version 1.23 without specifying the kubectlLayer property.',
'This may cause failures as the kubectl version provided with aws-cdk-lib is 1.20, which is only guaranteed to be compatible with Kubernetes versions 1.19-1.21.',
`Please provide a kubectlLayer from @aws-cdk/lambda-layer-kubectl-v${version}.`,
].join(' ');
}

test('not added when version < 1.22 and no kubectl layer provided', () => {
// GIVEN
const { stack } = testFixture();

// WHEN
new eks.Cluster(stack, 'Cluster1', {
version: eks.KubernetesVersion.V1_21,
prune: false,
});

// THEN
Annotations.fromStack(stack).hasNoWarning('/Stack/Cluster1', message('21'));
});

test('added when version >= 1.22 and no kubectl layer provided', () => {
// GIVEN
const { stack } = testFixture();

// WHEN
new eks.Cluster(stack, 'Cluster1', {
version: eks.KubernetesVersion.V1_23,
prune: false,
});

// THEN
Annotations.fromStack(stack).hasWarning('/Stack/Cluster1', message('23'));
});
});

test('custom awscli layer can be provided', () => {
// GIVEN
const { stack } = testFixture();
Expand Down
Binary file renamed ...04c8724dc5c8355b6e124a39af09449a3aa30.zip → ...0d8965ddf70c0e144af871d078fdbddf0a67d.zip
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions ...t/eks-bottlerocket-ng.integ.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "21.0.0",
"files": {
"c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30": {
"dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d": {
"source": {
"path": "asset.c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"path": "asset.dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"objectKey": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -105,15 +105,15 @@
}
}
},
"4c83be2cb27d35f5ebcdead395ca2da423e85d21119ceecee4aeb55986d1b0ae": {
"6827931205ccb42a1c15c1b863588327e792dd232f257d2ad1cf32854538f0e3": {
"source": {
"path": "aws-cdk-eks-cluster-bottlerocket-ng-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "4c83be2cb27d35f5ebcdead395ca2da423e85d21119ceecee4aeb55986d1b0ae.json",
"objectKey": "6827931205ccb42a1c15c1b863588327e792dd232f257d2ad1cf32854538f0e3.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...eks-bottlerocket-ng.integ.snapshot/aws-cdk-eks-cluster-bottlerocket-ng-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"S3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"Description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"Description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -640,7 +640,7 @@
]
},
"Config": {
"version": "1.22",
"version": "1.23",
"roleArn": {
"Fn::GetAtt": [
"ClusterRoleFA261979",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/test/eks-bottlerocket-ng.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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}/4c83be2cb27d35f5ebcdead395ca2da423e85d21119ceecee4aeb55986d1b0ae.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6827931205ccb42a1c15c1b863588327e792dd232f257d2ad1cf32854538f0e3.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-eks/test/eks-bottlerocket-ng.integ.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,9 +741,9 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"s3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"licenseInfo": "Apache-2.0"
}
},
Expand All @@ -754,7 +754,7 @@
}
},
"constructInfo": {
"fqn": "@aws-cdk/lambda-layer-kubectl-v22.KubectlV22Layer",
"fqn": "@aws-cdk/lambda-layer-kubectl-v23.KubectlV23Layer",
"version": "2.0.0"
}
},
Expand Down
Binary file modified ...integ.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip
View file
Open in desktop
Binary file not shown.
Binary file modified ...integ.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...04c8724dc5c8355b6e124a39af09449a3aa30.zip → ...0d8965ddf70c0e144af871d078fdbddf0a67d.zip
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions ...test/eks-cluster-handlers-vpc.integ.snapshot/aws-cdk-eks-handlers-in-vpc-test.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "21.0.0",
"files": {
"c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30": {
"dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d": {
"source": {
"path": "asset.c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"path": "asset.dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip",
"objectKey": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down Expand Up @@ -105,15 +105,15 @@
}
}
},
"d8b035beb3e2f00d909d6388deffc6d1a568e49f218d698a0ff456b1ad3410fa": {
"9911fd83c996d002742fa726a52e047d10938e112537f18be6ddf95b9c29acac": {
"source": {
"path": "aws-cdk-eks-handlers-in-vpc-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "d8b035beb3e2f00d909d6388deffc6d1a568e49f218d698a0ff456b1ad3410fa.json",
"objectKey": "9911fd83c996d002742fa726a52e047d10938e112537f18be6ddf95b9c29acac.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...st/eks-cluster-handlers-vpc.integ.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"S3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"Description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"Description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -656,7 +656,7 @@
]
},
"Config": {
"version": "1.22",
"version": "1.23",
"roleArn": {
"Fn::GetAtt": [
"EksAllHandlersInVpcStackRoleC36F09F0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/test/eks-cluster-handlers-vpc.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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}/d8b035beb3e2f00d909d6388deffc6d1a568e49f218d698a0ff456b1ad3410fa.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9911fd83c996d002742fa726a52e047d10938e112537f18be6ddf95b9c29acac.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-eks/test/eks-cluster-handlers-vpc.integ.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"s3Key": "c0f40a9fd16d1698ca05765606c04c8724dc5c8355b6e124a39af09449a3aa30.zip"
"s3Key": "dd8086b05eeea461708bd66ad140d8965ddf70c0e144af871d078fdbddf0a67d.zip"
},
"description": "/opt/kubectl/kubectl 1.22; /opt/helm/helm 3.9",
"description": "/opt/kubectl/kubectl 1.23; /opt/helm/helm 3.9",
"licenseInfo": "Apache-2.0"
}
},
Expand All @@ -69,7 +69,7 @@
}
},
"constructInfo": {
"fqn": "@aws-cdk/lambda-layer-kubectl-v22.KubectlV22Layer",
"fqn": "@aws-cdk/lambda-layer-kubectl-v23.KubectlV23Layer",
"version": "2.0.0"
}
},
Expand Down
Binary file modified ...integ.snapshot/asset.4288ebb3652acdf2d828b7db7ca44a7162a401ace50ebb4026e84b18a02a06ee.zip
View file
Open in desktop
Binary file not shown.
Binary file modified ...integ.snapshot/asset.c409e6c5845f1f349df8cd84e160bf6f1c35d2b060b63e1f032f9bd39d4542cc.zip
View file
Open in desktop
Binary file not shown.
Binary file renamed ...04c8724dc5c8355b6e124a39af09449a3aa30.zip → ...0d8965ddf70c0e144af871d078fdbddf0a67d.zip
View file
Open in desktop
Binary file not shown.
Loading