Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
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 { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
Expand All @@ -12,15 +11,14 @@ import * as eks from 'aws-cdk-lib/aws-eks';
// 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,
'1.31': KubectlV31Layer,
'1.32': KubectlV32Layer,
};

export function getClusterVersionConfig(scope: Construct, version?: eks.KubernetesVersion) {
const _version = version ?? eks.KubernetesVersion.V1_24;
const _version = version ?? eks.KubernetesVersion.V1_32;
return {
version: _version,
// Crazy type-casting is required because KubectlLayer peer depends on
Expand Down
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

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

This file was deleted.

This file was deleted.

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

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": "c475180f5b1bbabac165414da13a9b843b111cd3b6d5fae9c954c006640c4064.zip"
"S3Key": "6094cb0ff874f89ab5ab24fb6b9417df0fdeb6966645f90c88ec1d7e28130112.zip"
},
"Description": "/opt/kubectl/kubectl 1.24; /opt/helm/helm 3.9",
"Description": "/opt/kubectl/kubectl 1.32.3; /opt/helm/helm 3.17.2",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -755,7 +755,7 @@
]
},
"Config": {
"version": "1.24",
"version": "1.32",
"roleArn": {
"Fn::GetAtt": [
"ClusterRoleFA261979",
Expand Down Expand Up @@ -1051,6 +1051,9 @@
"Ref": "Cluster9EE0221C"
},
"ForceUpdateEnabled": true,
"InstanceTypes": [
"c6g.large"
],
"NodeRole": {
"Fn::GetAtt": [
"ClusterNodegroupBottlerocketNG2NodeGroupRole8BD62EDB",
Expand Down Expand Up @@ -1091,7 +1094,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/6eccfa6a92cc71dd88c7c2cb0e55fa70e512bbd581bba83e798dfb21037dd3c2.json"
"/ff91aef934adcfcb4a9eb6dfb4b853e99c17e1de4fa980ad666d8994731ff3d8.json"
]
]
}
Expand Down Expand Up @@ -1141,7 +1144,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/4db0899751ca9bd0598177a169df37433fa335f41ca7c3551b901fff8f840b91.json"
"/f0b05ca768f00cf79850a8fde28aba3b2b57234f261467ee353f4755a54acfc1.json"
]
]
}
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
},
"Description": "onEvent handler for EKS cluster resource provider",
"Environment": {
Expand Down Expand Up @@ -123,7 +123,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
},
"Description": "isComplete handler for EKS cluster resource provider",
"Environment": {
Expand Down
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": "fba306965da4b2680dd8b4e6916610efe237162f913f22b10146f647b3f6bce4.zip"
"S3Key": "96b83d7c7535f7e731e0679249de9470f417342331b121e36664078b4ef4a11b.zip"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Environment": {
Expand Down Expand Up @@ -54,7 +54,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip"
"S3Key": "12157b27d30ab71eb24ae65825f672ba5cc2c09dbb1703cd7adfcff3aeaca136.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down

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

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

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

Loading
Loading