feat(eks): support for Kubernetes version 1.23

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

@@ -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
@@ -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;
+    if (kubectlVersion >= 122 && !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-v${kubectlVersion % 100}.`);
     };
     this.version = props.version;
     this.kubectlLambdaRole = props.kubectlLambdaRole ? props.kubectlLambdaRole : undefined;
@@ -2300,7 +2310,7 @@ export enum CoreDnsComputeType {
   /**
    * Deploy CoreDNS on Fargate-managed instances.
    */
-  FARGATE = 'fargate'
+  FARGATE = 'fargate',
 }
 
 /**
@@ -2314,7 +2324,7 @@ export enum DefaultCapacityType {
   /**
    * EC2 autoscaling group
    */
-  EC2
+  EC2,
 }
 
 /**
@@ -2328,7 +2338,7 @@ export enum MachineImageType {
   /**
    * Bottlerocket AMI
    */
-  BOTTLEROCKET
+  BOTTLEROCKET,
 }
 
 function nodeTypeForInstanceType(instanceType: ec2.InstanceType) {

packages/@aws-cdk/aws-eks/package.json

@@ -80,7 +80,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-cdk/lambda-layer-kubectl-v22": "2.0.0",
+    "@aws-cdk/lambda-layer-kubectl-v22": "^2.0.0",
+    "@aws-cdk/lambda-layer-kubectl-v23": "^2.0.0",
     "aws-cdk-lib": "^2.47.0",
     "@aws-cdk/assertions": "0.0.0",
     "@aws-cdk/cdk-build-tools": "0.0.0",

packages/@aws-cdk/aws-eks/test/integ-tests-kubernetes-version.ts

@@ -1,14 +1,14 @@
 import * as lambda from '@aws-cdk/aws-lambda';
-import { KubectlV22Layer } from '@aws-cdk/lambda-layer-kubectl-v22';
+import { KubectlV23Layer } from '@aws-cdk/lambda-layer-kubectl-v23';
 import { Construct } from 'constructs';
 import * as eks from '../lib';
 
 export function getClusterVersionConfig(scope: Construct) {
   return {
-    version: eks.KubernetesVersion.V1_22,
+    version: eks.KubernetesVersion.V1_23,
     // Crazy type-casting is required because KubectlLayer peer depends on
     // types from aws-cdk-lib, but we run integration tests in the @aws-cdk/
     // v1-style directory, not in the aws-cdk-lib v2-style directory.
-    kubectlLayer: new KubectlV22Layer(scope, 'KubectlLayer') as unknown as lambda.ILayerVersion,
+    kubectlLayer: new KubectlV23Layer(scope, 'KubectlLayer') as unknown as lambda.ILayerVersion,
   };
 };

yarn.lock

@@ -35,11 +35,16 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@aws-cdk/lambda-layer-kubectl-v22@2.0.0":
+"@aws-cdk/lambda-layer-kubectl-v22@^2.0.0":
   version "2.0.0"
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v22/-/lambda-layer-kubectl-v22-2.0.0.tgz#18daadbb856a42377c04ea81b029debc1523ad3a"
   integrity sha512-GdpZbfry6jJ+NGOxYNrmTm0TNU3xjhjROgIiy9fdFZzb6PaKBglLftBAJbyNldPbvWfl2G+PJWe2jBURUkeacw==
 
+"@aws-cdk/lambda-layer-kubectl-v23@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v23/-/lambda-layer-kubectl-v23-2.0.0.tgz#8e46c505c8ba106d7589c9bebda824b8d963463c"
+  integrity sha512-g0H20+aWk6p4NsLSnMwUCwuLbD9v1tLPYH8c229w/qT6B7U/DFliQmiSnGSxe7BOjL/qfIkLfvXReBji15yEvg==
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"