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

feat(eks): support for Kubernetes version 1.30 #30454

Merged
merged 5 commits into from
Jun 6, 2024
Merged

feat(eks): support for Kubernetes version 1.30 #30454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
083dec6
update
pahud Jun 6, 2024
ac8810f
update package.json
pahud Jun 6, 2024
d9d3ddf
update tests
pahud Jun 6, 2024
7d02701
update tests
pahud Jun 6, 2024
16ebb54
update tests
pahud Jun 6, 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
1 change: 1 addition & 0 deletions packages/@aws-cdk-testing/framework-integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1610.0",
"aws-sdk-mock": "5.6.0",
Expand Down
12 changes: 9 additions & 3 deletions ...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ-tests-kubernetes-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import * as lambda from 'aws-cdk-lib/aws-lambda';
import { KubectlV24Layer } from '@aws-cdk/lambda-layer-kubectl-v24';
import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30';
import { Construct } from 'constructs';
import * as eks from 'aws-cdk-lib/aws-eks';

const versionMap: { [key: string]: any } = {
1.24: KubectlV24Layer,
1.29: KubectlV29Layer,
// This object maps Kubernetes version strings to their corresponding
// KubectlLayerVersion constructor functions. This allows us to dynamically
// create the appropriate KubectlLayerVersion instance based on the
// Kubernetes version.
const versionMap: { [key: string]: new (scope: Construct, id: string) => lambda.ILayerVersion } = {
'1.24': KubectlV24Layer,
'1.29': KubectlV29Layer,
'1.30': KubectlV30Layer,
};

export function getClusterVersionConfig(scope: Construct, version?: eks.KubernetesVersion) {
Expand Down
Binary file renamed ...f2dcb75a40a43a9a2efbcfc9ae39535c6260c.zip → ...901edd66d1367f617c2a01ac6e86ca2b7eb84.zip
View file
Open in desktop
Binary file not shown.
60 changes: 30 additions & 30 deletions ...65fbbaceccb0547fcb880284cd4970f3/index.js → ...d833d67973da5291085b4dc7be1a568a/index.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...3ef5904947e87504f8d7069/apply/__init__.py → ...4518518480c0d9fb344a098/apply/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...173ef5904947e87504f8d7069/get/__init__.py → ...f54518518480c0d9fb344a098/get/__init__.py
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions ...73ef5904947e87504f8d7069/helm/__init__.py → ...54518518480c0d9fb344a098/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 ...c9768d3173ef5904947e87504f8d7069/index.py → ...20557cff54518518480c0d9fb344a098/index.py
View file
Open in desktop
File renamed without changes.
0 ...3ef5904947e87504f8d7069/patch/__init__.py → ...4518518480c0d9fb344a098/patch/__init__.py
View file
Open in desktop
File renamed without changes.
Binary file renamed ...6ece293bd0ae6940bc65a5b99008ab54f60f7.zip → ...7cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip
View file
Open in desktop
Binary file not shown.
36 changes: 18 additions & 18 deletions ...eg.eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-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.

10 changes: 5 additions & 5 deletions ....eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-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": "b5925bba477fd1ac27c3a695a9f6ece293bd0ae6940bc65a5b99008ab54f60f7.zip"
"S3Key": "bfbdea4d45250c8162c204fe0687cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip"
},
"Description": "/opt/kubectl/kubectl 1.29; /opt/helm/helm 3.14",
"Description": "/opt/kubectl/kubectl 1.30; /opt/helm/helm 3.15",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -755,7 +755,7 @@
]
},
"Config": {
"version": "1.29",
"version": "1.30",
"roleArn": {
"Fn::GetAtt": [
"ClusterRoleFA261979",
Expand Down Expand Up @@ -1090,7 +1090,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/471fe4d6391a89009b531814efc9974653ad7582640370a65c9c1295e6f5e4bc.json"
"/f60bb443f247dda63ec8772a7627d54d50a56350ed4e8c906bc15e8272052a12.json"
]
]
}
Expand Down Expand Up @@ -1140,7 +1140,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/b950d200e14479f797ff28cd9b5f20f6292b459a527fd88842f706bd93ec4e88.json"
"/5ae608f2a0d8bc3f9dbe5f1a3254a5e50e17eb42f6cf3459a3687bcd7f00db86.json"
]
]
}
Expand Down
6 changes: 3 additions & 3 deletions ...lusteral2023nodegrouptestawscdkawseksClusterResourceProviderE67D0702.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": "9202bb21d52e07810fc1da0f6acf2dcb75a40a43a9a2efbcfc9ae39535c6260c.zip"
"S3Key": "22de69e75b55e15d4d49905d8a4901edd66d1367f617c2a01ac6e86ca2b7eb84.zip"
},
"Description": "/opt/nodejs/node_modules/proxy-agent"
}
Expand Down Expand Up @@ -50,7 +50,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "71aae489e8a9171b4e9c4ed9b264e3dad2dd3abfa40efb57071906931624ca52.zip"
"S3Key": "98b432f1b1df9de4026df7e718c23783d833d67973da5291085b4dc7be1a568a.zip"
},
"Description": "onEvent handler for EKS cluster resource provider",
"Environment": {
Expand Down Expand Up @@ -115,7 +115,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "71aae489e8a9171b4e9c4ed9b264e3dad2dd3abfa40efb57071906931624ca52.zip"
"S3Key": "98b432f1b1df9de4026df7e718c23783d833d67973da5291085b4dc7be1a568a.zip"
},
"Description": "isComplete handler for EKS cluster resource provider",
"Environment": {
Expand Down
2 changes: 1 addition & 1 deletion ...scdkeksclusteral2023nodegrouptestawscdkawseksKubectlProvider3D3ED876.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": "1471fa6f2876749a13de79989efc6651c9768d3173ef5904947e87504f8d7069.zip"
"S3Key": "abc70c90ded969d12235ca11768293cb20557cff54518518480c0d9fb344a098.zip"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Handler": "index.handler",
Expand Down
7 changes: 5 additions & 2 deletions ...ng/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.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.

Loading
Loading