Skip to content

Commit 91837fd

Browse files
guessiguessi
committed
chore(eks-v2-alpha): support KubernetesVersion.V1_33
1 parent 72733ea commit 91837fd

File tree

4 files changed

+50
-40
lines changed

4 files changed

+50
-40
lines changed

‎packages/@aws-cdk/aws-eks-v2-alpha/lib/cluster.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,15 @@ export class KubernetesVersion {
676676
*/
677677
public static readonly V1_32 = KubernetesVersion.of('1.32');
678678

679+
/**
680+
* Kubernetes version 1.33
681+
*
682+
* When creating a `Cluster` with this version, you need to also specify the
683+
* `kubectlLayer` property with a `KubectlV33Layer` from
684+
* `@aws-cdk/lambda-layer-kubectl-v33`.
685+
*/
686+
public static readonly V1_33 = KubernetesVersion.of('1.33');
687+
679688
/**
680689
* Custom cluster version
681690
* @param version custom version number

‎packages/@aws-cdk/aws-eks-v2-alpha/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.4",
9393
"@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
9494
"@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
95+
"@aws-cdk/lambda-layer-kubectl-v33": "^2.0.0",
9596
"@types/jest": "^29.5.14",
9697
"aws-sdk": "^2.1692.0",
9798
"aws-cdk-lib": "0.0.0",

‎packages/@aws-cdk/aws-eks-v2-alpha/test/automode.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
44
import * as eks from '../lib';
55
import { testFixtureNoVpc } from './util';
66

7-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_32;
7+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_33;
88

99
describe('eks auto mode', () => {
1010
describe('basic configuration', () => {

‎packages/@aws-cdk/aws-eks-v2-alpha/test/cluster.test.ts‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as path from 'path';
33
import * as cdk8s from 'cdk8s';
44
import { Construct } from 'constructs';
55
import * as YAML from 'yaml';
6-
import { KubectlV32Layer } from '@aws-cdk/lambda-layer-kubectl-v32';
6+
import { KubectlV33Layer } from '@aws-cdk/lambda-layer-kubectl-v33';
77
import { testFixture, testFixtureNoVpc } from './util';
88
import { Match, Template } from 'aws-cdk-lib/assertions';
99
import * as asg from 'aws-cdk-lib/aws-autoscaling';
@@ -19,7 +19,7 @@ import { BottleRocketImage } from '../lib/private/bottlerocket';
1919

2020
/* eslint-disable max-len */
2121

22-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_32;
22+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_33;
2323
const commonProps = {
2424
version: CLUSTER_VERSION,
2525
defaultCapacity: 0,
@@ -36,7 +36,7 @@ describe('cluster', () => {
3636
version: eks.AlbControllerVersion.V2_4_1,
3737
},
3838
kubectlProviderOptions: {
39-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
39+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
4040
},
4141
});
4242

@@ -241,7 +241,7 @@ describe('cluster', () => {
241241
...commonProps,
242242
prune: false,
243243
kubectlProviderOptions: {
244-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
244+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
245245
},
246246
});
247247

@@ -336,7 +336,7 @@ describe('cluster', () => {
336336
...commonProps,
337337
prune: false,
338338
kubectlProviderOptions: {
339-
kubectlLayer: new KubectlV32Layer(this, 'kubectlLayer'),
339+
kubectlLayer: new KubectlV33Layer(this, 'kubectlLayer'),
340340
},
341341
});
342342
}
@@ -388,7 +388,7 @@ describe('cluster', () => {
388388
version: CLUSTER_VERSION,
389389
prune: false,
390390
kubectlProviderOptions: {
391-
kubectlLayer: new KubectlV32Layer(this, 'kubectlLayer'),
391+
kubectlLayer: new KubectlV33Layer(this, 'kubectlLayer'),
392392
},
393393
});
394394
}
@@ -431,7 +431,7 @@ describe('cluster', () => {
431431
version: CLUSTER_VERSION,
432432
prune: false,
433433
kubectlProviderOptions: {
434-
kubectlLayer: new KubectlV32Layer(this, 'kubectlLayer'),
434+
kubectlLayer: new KubectlV33Layer(this, 'kubectlLayer'),
435435
},
436436
});
437437
}
@@ -464,7 +464,7 @@ describe('cluster', () => {
464464
version: CLUSTER_VERSION,
465465
prune: false,
466466
kubectlProviderOptions: {
467-
kubectlLayer: new KubectlV32Layer(this, 'kubectlLayer'),
467+
kubectlLayer: new KubectlV33Layer(this, 'kubectlLayer'),
468468
},
469469
});
470470
}
@@ -931,7 +931,7 @@ describe('cluster', () => {
931931
...commonProps,
932932
prune: false,
933933
kubectlProviderOptions: {
934-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
934+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
935935
},
936936
});
937937

@@ -956,7 +956,7 @@ describe('cluster', () => {
956956
version: CLUSTER_VERSION,
957957
prune: false,
958958
kubectlProviderOptions: {
959-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
959+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
960960
},
961961
}); // cluster is under stack2
962962

@@ -1072,7 +1072,7 @@ describe('cluster', () => {
10721072
...commonProps,
10731073
prune: false,
10741074
kubectlProviderOptions: {
1075-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1075+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
10761076
},
10771077
});
10781078

@@ -1143,7 +1143,7 @@ describe('cluster', () => {
11431143
)).toEqual(true);
11441144
expect(Object.entries(parameters).some(
11451145
([k, v]) => k.startsWith('SsmParameterValueawsserviceeksoptimizedami') &&
1146-
(v as any).Default.includes('/1.32/'),
1146+
(v as any).Default.includes('/1.33/'),
11471147
)).toEqual(true);
11481148
});
11491149

@@ -1321,7 +1321,7 @@ describe('cluster', () => {
13211321
)).toEqual(true);
13221322
expect(Object.entries(parameters).some(
13231323
([k, v]) => k.startsWith('SsmParameterValueawsservicebottlerocketaws') &&
1324-
(v as any).Default.includes('/aws-k8s-1.32/'),
1324+
(v as any).Default.includes('/aws-k8s-1.33/'),
13251325
)).toEqual(true);
13261326
});
13271327

@@ -1335,7 +1335,7 @@ describe('cluster', () => {
13351335
version: CLUSTER_VERSION,
13361336
prune: false,
13371337
kubectlProviderOptions: {
1338-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1338+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
13391339
},
13401340
});
13411341

@@ -1389,7 +1389,7 @@ describe('cluster', () => {
13891389
...commonProps,
13901390
prune: false,
13911391
kubectlProviderOptions: {
1392-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1392+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
13931393
},
13941394
});
13951395

@@ -1413,7 +1413,7 @@ describe('cluster', () => {
14131413
...commonProps,
14141414
prune: false,
14151415
kubectlProviderOptions: {
1416-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1416+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
14171417
},
14181418
});
14191419

@@ -1437,7 +1437,7 @@ describe('cluster', () => {
14371437
...commonProps,
14381438
prune: false,
14391439
kubectlProviderOptions: {
1440-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1440+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
14411441
},
14421442
});
14431443

@@ -1461,7 +1461,7 @@ describe('cluster', () => {
14611461
...commonProps,
14621462
prune: false,
14631463
kubectlProviderOptions: {
1464-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1464+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
14651465
},
14661466
});
14671467

@@ -1486,7 +1486,7 @@ describe('cluster', () => {
14861486
...commonProps,
14871487
prune: false,
14881488
kubectlProviderOptions: {
1489-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1489+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
14901490
},
14911491
});
14921492

@@ -1509,7 +1509,7 @@ describe('cluster', () => {
15091509
...commonProps,
15101510
prune: false,
15111511
kubectlProviderOptions: {
1512-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1512+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
15131513
},
15141514
});
15151515

@@ -1533,7 +1533,7 @@ describe('cluster', () => {
15331533
version: CLUSTER_VERSION,
15341534
prune: false,
15351535
kubectlProviderOptions: {
1536-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1536+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
15371537
},
15381538
});
15391539

@@ -1583,7 +1583,7 @@ describe('cluster', () => {
15831583
version: CLUSTER_VERSION,
15841584
prune: false,
15851585
kubectlProviderOptions: {
1586-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1586+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
15871587
},
15881588
});
15891589

@@ -1677,7 +1677,7 @@ describe('cluster', () => {
16771677
prune: false,
16781678
endpointAccess: eks.EndpointAccess.PRIVATE,
16791679
kubectlProviderOptions: {
1680-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1680+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
16811681
environment: {
16821682
Foo: 'Bar',
16831683
},
@@ -1699,7 +1699,7 @@ describe('cluster', () => {
16991699
prune: false,
17001700
endpointAccess: eks.EndpointAccess.PRIVATE,
17011701
kubectlProviderOptions: {
1702-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1702+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
17031703
environment: {
17041704
Foo: 'Bar',
17051705
},
@@ -1740,7 +1740,7 @@ describe('cluster', () => {
17401740
prune: false,
17411741
endpointAccess: eks.EndpointAccess.PRIVATE,
17421742
kubectlProviderOptions: {
1743-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1743+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
17441744
role: kubectlRole,
17451745
},
17461746
});
@@ -1810,7 +1810,7 @@ describe('cluster', () => {
18101810
endpointAccess: eks.EndpointAccess.PUBLIC,
18111811
vpcSubnets: [{ subnetType: ec2.SubnetType.PUBLIC }],
18121812
kubectlProviderOptions: {
1813-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1813+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
18141814
},
18151815
});
18161816

@@ -1828,7 +1828,7 @@ describe('cluster', () => {
18281828
version: CLUSTER_VERSION,
18291829
endpointAccess: eks.EndpointAccess.PUBLIC,
18301830
kubectlProviderOptions: {
1831-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1831+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
18321832
},
18331833
});
18341834

@@ -1860,7 +1860,7 @@ describe('cluster', () => {
18601860
prune: false,
18611861
endpointAccess: eks.EndpointAccess.PRIVATE,
18621862
kubectlProviderOptions: {
1863-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1863+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
18641864
},
18651865
});
18661866

@@ -1878,7 +1878,7 @@ describe('cluster', () => {
18781878
endpointAccess: eks.EndpointAccess.PUBLIC_AND_PRIVATE,
18791879
vpcSubnets: [{ subnetType: ec2.SubnetType.PUBLIC }],
18801880
kubectlProviderOptions: {
1881-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1881+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
18821882
},
18831883
});
18841884

@@ -1897,7 +1897,7 @@ describe('cluster', () => {
18971897
prune: false,
18981898
endpointAccess: eks.EndpointAccess.PUBLIC_AND_PRIVATE,
18991899
kubectlProviderOptions: {
1900-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1900+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
19011901
},
19021902
});
19031903

@@ -1928,7 +1928,7 @@ describe('cluster', () => {
19281928
prune: false,
19291929
endpointAccess: eks.EndpointAccess.PUBLIC_AND_PRIVATE.onlyFrom('1.2.3.4/32'),
19301930
kubectlProviderOptions: {
1931-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1931+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
19321932
},
19331933
});
19341934

@@ -1988,7 +1988,7 @@ describe('cluster', () => {
19881988
prune: false,
19891989
endpointAccess: eks.EndpointAccess.PRIVATE,
19901990
kubectlProviderOptions: {
1991-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
1991+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
19921992
},
19931993
});
19941994

@@ -2055,7 +2055,7 @@ describe('cluster', () => {
20552055
],
20562056
}],
20572057
kubectlProviderOptions: {
2058-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2058+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
20592059
},
20602060
});
20612061

@@ -2082,7 +2082,7 @@ describe('cluster', () => {
20822082
],
20832083
}],
20842084
kubectlProviderOptions: {
2085-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2085+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
20862086
},
20872087
});
20882088

@@ -2110,7 +2110,7 @@ describe('cluster', () => {
21102110
})],
21112111
}],
21122112
kubectlProviderOptions: {
2113-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2113+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
21142114
},
21152115
});
21162116

@@ -2154,7 +2154,7 @@ describe('cluster', () => {
21542154
endpointAccess: eks.EndpointAccess.PRIVATE,
21552155
vpc,
21562156
kubectlProviderOptions: {
2157-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2157+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
21582158
},
21592159
});
21602160

@@ -2219,7 +2219,7 @@ describe('cluster', () => {
22192219
vpc: vpc2,
22202220
vpcSubnets: [{ subnetGroupName: 'Private1' }, { subnetGroupName: 'Private2' }],
22212221
kubectlProviderOptions: {
2222-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2222+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
22232223
},
22242224
});
22252225

@@ -2300,7 +2300,7 @@ describe('cluster', () => {
23002300
version: CLUSTER_VERSION,
23012301
prune: false,
23022302
kubectlProviderOptions: {
2303-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2303+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
23042304
},
23052305
});
23062306

@@ -2373,7 +2373,7 @@ describe('cluster', () => {
23732373
prune: false,
23742374
kubectlProviderOptions: {
23752375
awscliLayer: layer,
2376-
kubectlLayer: new KubectlV32Layer(stack, 'kubectlLayer'),
2376+
kubectlLayer: new KubectlV33Layer(stack, 'kubectlLayer'),
23772377
},
23782378
});
23792379

0 commit comments

Comments
 (0)