Skip to content

Commit 72c22dc

Browse files
pahudpahud
authored
feat(eks): support Kubernetes 1.19 (#13094)
Support KubernetesVersion 1.19 Fixed: #13093 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 74347dd commit 72c22dc

14 files changed

+155
-152
lines changed

‎packages/@aws-cdk/aws-eks/README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This example defines an Amazon EKS cluster with the following configuration:
4949
```ts
5050
// provisiong a cluster
5151
const cluster = new eks.Cluster(this, 'hello-eks', {
52-
version: eks.KubernetesVersion.V1_18,
52+
version: eks.KubernetesVersion.V1_19,
5353
});
5454

5555
// apply a kubernetes manifest to the cluster
@@ -142,15 +142,15 @@ Creating a new cluster is done using the `Cluster` or `FargateCluster` construct
142142

143143
```ts
144144
new eks.Cluster(this, 'HelloEKS', {
145-
version: eks.KubernetesVersion.V1_18,
145+
version: eks.KubernetesVersion.V1_19,
146146
});
147147
```
148148

149149
You can also use `FargateCluster` to provision a cluster that uses only fargate workers.
150150

151151
```ts
152152
new eks.FargateCluster(this, 'HelloEKS', {
153-
version: eks.KubernetesVersion.V1_18,
153+
version: eks.KubernetesVersion.V1_19,
154154
});
155155
```
156156

@@ -174,7 +174,7 @@ At cluster instantiation time, you can customize the number of instances and the
174174

175175
```ts
176176
new eks.Cluster(this, 'HelloEKS', {
177-
version: eks.KubernetesVersion.V1_18,
177+
version: eks.KubernetesVersion.V1_19,
178178
defaultCapacity: 5,
179179
defaultCapacityInstance: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.SMALL),
180180
});
@@ -186,7 +186,7 @@ Additional customizations are available post instantiation. To apply them, set t
186186

187187
```ts
188188
const cluster = new eks.Cluster(this, 'HelloEKS', {
189-
version: eks.KubernetesVersion.V1_18,
189+
version: eks.KubernetesVersion.V1_19,
190190
defaultCapacity: 0,
191191
});
192192

@@ -322,7 +322,7 @@ The following code defines an Amazon EKS cluster with a default Fargate Profile
322322

323323
```ts
324324
const cluster = new eks.FargateCluster(this, 'MyCluster', {
325-
version: eks.KubernetesVersion.V1_18,
325+
version: eks.KubernetesVersion.V1_19,
326326
});
327327
```
328328

@@ -381,7 +381,7 @@ You can also configure the cluster to use an auto-scaling group as the default c
381381

382382
```ts
383383
cluster = new eks.Cluster(this, 'HelloEKS', {
384-
version: eks.KubernetesVersion.V1_18,
384+
version: eks.KubernetesVersion.V1_19,
385385
defaultCapacityType: eks.DefaultCapacityType.EC2,
386386
});
387387
```
@@ -461,7 +461,7 @@ You can configure the [cluster endpoint access](https://docs.aws.amazon.com/eks/
461461

462462
```ts
463463
const cluster = new eks.Cluster(this, 'hello-eks', {
464-
version: eks.KubernetesVersion.V1_18,
464+
version: eks.KubernetesVersion.V1_19,
465465
endpointAccess: eks.EndpointAccess.PRIVATE // No access outside of your VPC.
466466
});
467467
```
@@ -474,7 +474,7 @@ You can specify the VPC of the cluster using the `vpc` and `vpcSubnets` properti
474474
const vpc = new ec2.Vpc(this, 'Vpc');
475475

476476
new eks.Cluster(this, 'HelloEKS', {
477-
version: eks.KubernetesVersion.V1_18,
477+
version: eks.KubernetesVersion.V1_19,
478478
vpc,
479479
vpcSubnets: [{ subnetType: ec2.SubnetType.PRIVATE }]
480480
});
@@ -513,7 +513,7 @@ You can configure the environment of this function by specifying it at cluster i
513513

514514
```ts
515515
const cluster = new eks.Cluster(this, 'hello-eks', {
516-
version: eks.KubernetesVersion.V1_18,
516+
version: eks.KubernetesVersion.V1_19,
517517
clusterHandlerEnvironment: {
518518
'http_proxy': 'http://proxy.myproxy.com'
519519
}
@@ -530,7 +530,7 @@ You can configure the environment of this function by specifying it at cluster i
530530

531531
```ts
532532
const cluster = new eks.Cluster(this, 'hello-eks', {
533-
version: eks.KubernetesVersion.V1_18,
533+
version: eks.KubernetesVersion.V1_19,
534534
kubectlEnvironment: {
535535
'http_proxy': 'http://proxy.myproxy.com'
536536
}
@@ -620,7 +620,7 @@ When you create a cluster, you can specify a `mastersRole`. The `Cluster` constr
620620
```ts
621621
const role = new iam.Role(...);
622622
new eks.Cluster(this, 'HelloEKS', {
623-
version: eks.KubernetesVersion.V1_18,
623+
version: eks.KubernetesVersion.V1_19,
624624
mastersRole: role,
625625
});
626626
```

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,11 @@ export class KubernetesVersion {
634634
*/
635635
public static readonly V1_18 = KubernetesVersion.of('1.18');
636636

637+
/**
638+
* Kubernetes version 1.19
639+
*/
640+
public static readonly V1_19 = KubernetesVersion.of('1.19');
641+
637642
/**
638643
* Custom cluster version
639644
* @param version custom version number

‎packages/@aws-cdk/aws-eks/test/example.ssh-into-nodes.lit.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class EksClusterStack extends cdk.Stack {
1010

1111
const cluster = new eks.Cluster(this, 'EKSCluster', {
1212
vpc,
13-
version: eks.KubernetesVersion.V1_18,
13+
version: eks.KubernetesVersion.V1_19,
1414
});
1515

1616
/// !show

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@
832832
]
833833
},
834834
"Config": {
835-
"version": "1.18",
835+
"version": "1.19",
836836
"roleArn": {
837837
"Fn::GetAtt": [
838838
"EksAllHandlersInVpcStackRoleC36F09F0",
@@ -1427,4 +1427,4 @@
14271427
"Description": "Artifact hash for asset \"11ba420a0c99f0c77f563fb974e76d6110b4445114137af1fe1b69b0d366d2d7\""
14281428
}
14291429
}
1430-
}
1430+
}

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster-handlers-vpc.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { App } from '@aws-cdk/core';
33
import * as eks from '../lib';
44
import { TestStack } from './util';
55

6-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_18;
6+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_19;
77

88

99
class EksAllHandlersInVpcStack extends TestStack {
@@ -22,4 +22,4 @@ const app = new App();
2222

2323
new EksAllHandlersInVpcStack(app, 'aws-cdk-eks-handlers-in-vpc-test');
2424

25-
app.synth();
25+
app.synth();

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.expected.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
]
773773
},
774774
"Config": {
775-
"version": "1.18",
775+
"version": "1.19",
776776
"roleArn": {
777777
"Fn::GetAtt": [
778778
"ClusterRoleFA261979",
@@ -1062,7 +1062,7 @@
10621062
},
10631063
"/",
10641064
{
1065-
"Ref": "AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beS3Bucket9E737267"
1065+
"Ref": "AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609S3BucketA8C94679"
10661066
},
10671067
"/",
10681068
{
@@ -1072,7 +1072,7 @@
10721072
"Fn::Split": [
10731073
"||",
10741074
{
1075-
"Ref": "AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beS3VersionKeyD5E002BC"
1075+
"Ref": "AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609S3VersionKey3777DB64"
10761076
}
10771077
]
10781078
}
@@ -1085,7 +1085,7 @@
10851085
"Fn::Split": [
10861086
"||",
10871087
{
1088-
"Ref": "AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beS3VersionKeyD5E002BC"
1088+
"Ref": "AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609S3VersionKey3777DB64"
10891089
}
10901090
]
10911091
}
@@ -1129,7 +1129,7 @@
11291129
},
11301130
"/",
11311131
{
1132-
"Ref": "AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0S3Bucket8FBFE327"
1132+
"Ref": "AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519S3Bucket686DCA97"
11331133
},
11341134
"/",
11351135
{
@@ -1139,7 +1139,7 @@
11391139
"Fn::Split": [
11401140
"||",
11411141
{
1142-
"Ref": "AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0S3VersionKeyF5A05918"
1142+
"Ref": "AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519S3VersionKey7EDC0140"
11431143
}
11441144
]
11451145
}
@@ -1152,7 +1152,7 @@
11521152
"Fn::Split": [
11531153
"||",
11541154
{
1155-
"Ref": "AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0S3VersionKeyF5A05918"
1155+
"Ref": "AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519S3VersionKey7EDC0140"
11561156
}
11571157
]
11581158
}
@@ -1195,17 +1195,17 @@
11951195
"ClusterSecurityGroupId"
11961196
]
11971197
},
1198-
"referencetoawscdkeksclusterprivateendpointtestAssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket4A0D6BE2Ref": {
1199-
"Ref": "AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket6DACDE73"
1198+
"referencetoawscdkeksclusterprivateendpointtestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketFD6C4D26Ref": {
1199+
"Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7"
12001200
},
1201-
"referencetoawscdkeksclusterprivateendpointtestAssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey6D9B8A02Ref": {
1202-
"Ref": "AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey015AEA61"
1201+
"referencetoawscdkeksclusterprivateendpointtestAssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKey69E4725CRef": {
1202+
"Ref": "AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKeyE415415F"
12031203
},
1204-
"referencetoawscdkeksclusterprivateendpointtestAssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3BucketD44FB215Ref": {
1205-
"Ref": "AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3Bucket7EE7EA15"
1204+
"referencetoawscdkeksclusterprivateendpointtestAssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket5323F34ARef": {
1205+
"Ref": "AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket6ABE1927"
12061206
},
1207-
"referencetoawscdkeksclusterprivateendpointtestAssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKey6C30661CRef": {
1208-
"Ref": "AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKey6C948E78"
1207+
"referencetoawscdkeksclusterprivateendpointtestAssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKey548D79B4Ref": {
1208+
"Ref": "AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKeyF55A2EA9"
12091209
},
12101210
"referencetoawscdkeksclusterprivateendpointtestVpcFCD064BFRef": {
12111211
"Ref": "Vpc8378EB38"
@@ -1299,53 +1299,53 @@
12991299
"Type": "String",
13001300
"Description": "Artifact hash for asset \"bafd50ae9f214e496ff8c72c6425f93dca3ccd590e20963706d5d610d9c75757\""
13011301
},
1302-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3Bucket6DACDE73": {
1302+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3BucketAEADE8C7": {
13031303
"Type": "String",
1304-
"Description": "S3 bucket for asset \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
1304+
"Description": "S3 bucket for asset \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
13051305
},
1306-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1S3VersionKey015AEA61": {
1306+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68S3VersionKeyE415415F": {
13071307
"Type": "String",
1308-
"Description": "S3 key for asset version \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
1308+
"Description": "S3 key for asset version \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
13091309
},
1310-
"AssetParametersefd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1ArtifactHashC9FD06BA": {
1310+
"AssetParameterse9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68ArtifactHashD9A515C3": {
13111311
"Type": "String",
1312-
"Description": "Artifact hash for asset \"efd72738f046105c96299fb31b3da40320e71ee9cf74bc37720042898403e2a1\""
1312+
"Description": "Artifact hash for asset \"e9882ab123687399f934da0d45effe675ecc8ce13b40cb946f3e1d6141fe8d68\""
13131313
},
1314-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3Bucket7EE7EA15": {
1314+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3Bucket6ABE1927": {
13151315
"Type": "String",
1316-
"Description": "S3 bucket for asset \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
1316+
"Description": "S3 bucket for asset \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
13171317
},
1318-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fS3VersionKey6C948E78": {
1318+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0S3VersionKeyF55A2EA9": {
13191319
"Type": "String",
1320-
"Description": "S3 key for asset version \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
1320+
"Description": "S3 key for asset version \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
13211321
},
1322-
"AssetParametersb61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449fArtifactHash7E705796": {
1322+
"AssetParameters844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0ArtifactHash1D7A2D6E": {
13231323
"Type": "String",
1324-
"Description": "Artifact hash for asset \"b61858bbf1a0be803552e3efa9647befd728156696dff1b413b7b2fd4da1449f\""
1324+
"Description": "Artifact hash for asset \"844c1a4b13479b359ea0e607dccb4a04b73e22cf88cf9b64feed2c5f0de213c0\""
13251325
},
1326-
"AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beS3Bucket9E737267": {
1326+
"AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609S3BucketA8C94679": {
13271327
"Type": "String",
1328-
"Description": "S3 bucket for asset \"84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08be\""
1328+
"Description": "S3 bucket for asset \"75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609\""
13291329
},
1330-
"AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beS3VersionKeyD5E002BC": {
1330+
"AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609S3VersionKey3777DB64": {
13311331
"Type": "String",
1332-
"Description": "S3 key for asset version \"84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08be\""
1332+
"Description": "S3 key for asset version \"75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609\""
13331333
},
1334-
"AssetParameters84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08beArtifactHashDF0A0444": {
1334+
"AssetParameters75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609ArtifactHash14CC8C95": {
13351335
"Type": "String",
1336-
"Description": "Artifact hash for asset \"84ba29b05aaf6a233dbb97b37e48eb1300f9d014f270252e29a8b2c22d6a08be\""
1336+
"Description": "Artifact hash for asset \"75667ab2bbef2c8efc57fb73bf352f345af1d471fb09cb11f5b7bc27d009b609\""
13371337
},
1338-
"AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0S3Bucket8FBFE327": {
1338+
"AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519S3Bucket686DCA97": {
13391339
"Type": "String",
1340-
"Description": "S3 bucket for asset \"2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0\""
1340+
"Description": "S3 bucket for asset \"eb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519\""
13411341
},
1342-
"AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0S3VersionKeyF5A05918": {
1342+
"AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519S3VersionKey7EDC0140": {
13431343
"Type": "String",
1344-
"Description": "S3 key for asset version \"2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0\""
1344+
"Description": "S3 key for asset version \"eb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519\""
13451345
},
1346-
"AssetParameters2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0ArtifactHashDFBC9DE7": {
1346+
"AssetParameterseb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519ArtifactHashE5817DEB": {
13471347
"Type": "String",
1348-
"Description": "Artifact hash for asset \"2e2ec0fae5975d4ee5f3580e522c46615c1bd344e0302bc5d2df7501b7bb1ad0\""
1348+
"Description": "Artifact hash for asset \"eb49ce353c5ff251ebe2c3225fe00fb3e9a68fcd8b10207e63a36bfc6e981519\""
13491349
}
13501350
}
13511351
}

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster-private-endpoint.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { App } from '@aws-cdk/core';
55
import * as eks from '../lib';
66
import { TestStack } from './util';
77

8-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_18;
8+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_19;
99

1010

1111
class EksClusterStack extends TestStack {

0 commit comments

Comments
 (0)