build: Update EKS from 29 to 30 TDE-1255

linz · Sep 29, 2024 · 68db36d · 68db36d
1 parent 956e893
commit 68db36d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/infra/charts/argo.extras.ts b/infra/charts/argo.extras.ts
@@ -1,5 +1,5 @@
 import { Chart, ChartProps } from 'cdk8s';
-import * as kplus from 'cdk8s-plus-29';
+import * as kplus from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';

diff --git a/infra/charts/argo.workflows.ts b/infra/charts/argo.workflows.ts
@@ -1,5 +1,5 @@
 import { Chart, ChartProps, Duration, Helm } from 'cdk8s';
-import { Secret } from 'cdk8s-plus-29';
+import { Secret } from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { ArgoDbName, ArgoDbUser, DefaultRegion } from '../constants.js';

diff --git a/infra/charts/cloudflared.ts b/infra/charts/cloudflared.ts
@@ -1,5 +1,5 @@
 import { Chart, ChartProps, Size } from 'cdk8s';
-import * as kplus from 'cdk8s-plus-29';
+import * as kplus from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';

diff --git a/infra/charts/event.exporter.ts b/infra/charts/event.exporter.ts
@@ -8,7 +8,7 @@ import {
   Namespace,
   ServiceAccount,
   Volume,
-} from 'cdk8s-plus-29';
+} from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';
@@ -28,7 +28,7 @@ export class EventExporter extends Chart {
       metadata: { name: 'event-exporter', namespace: props.namespace },
     });
 
-    // https://cdk8s.io/docs/latest/plus/cdk8s-plus-29/rbac/#role
+    // https://cdk8s.io/docs/latest/plus/cdk8s-plus-30/rbac/#role
     const clusterRole = new ClusterRole(this, 'event-exporter-cr', {
       metadata: { name: 'event-exporter' },
     });

diff --git a/infra/charts/kube-system.coredns.ts b/infra/charts/kube-system.coredns.ts
@@ -1,5 +1,5 @@
 import { Chart, ChartProps } from 'cdk8s';
-import * as kplus from 'cdk8s-plus-29';
+import * as kplus from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';

diff --git a/infra/charts/kube-system.node.local.dns.ts b/infra/charts/kube-system.node.local.dns.ts
@@ -1,5 +1,5 @@
 import { ApiObject, Chart, ChartProps, JsonPatch, Size } from 'cdk8s';
-import * as kplus from 'cdk8s-plus-29';
+import * as kplus from 'cdk8s-plus-30';
 import { Construct } from 'constructs';
 
 import { applyDefaultLabels } from '../util/labels.js';

diff --git a/infra/eks/cluster.ts b/infra/eks/cluster.ts
@@ -1,4 +1,4 @@
-import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
+import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30';
 import { Aws, CfnOutput, Duration, RemovalPolicy, SecretValue, Size, Stack, StackProps } from 'aws-cdk-lib';
 import * as chatbot from 'aws-cdk-lib/aws-chatbot';
 import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';
@@ -44,7 +44,7 @@ export class LinzEksCluster extends Stack {
   /* Cluster ID */
   id: string;
   /** Version of EKS to use, this must be aligned to the `kubectlLayer` */
-  version = KubernetesVersion.of('1.29');
+  version = KubernetesVersion.of('1.30');
   /** Argo needs a database for workflow archive */
   argoDb: DatabaseInstance;
   /** Argo needs a temporary bucket to store objects */
@@ -72,7 +72,7 @@ export class LinzEksCluster extends Stack {
       defaultCapacity: 0,
       vpcSubnets: [{ subnetType: SubnetType.PRIVATE_WITH_EGRESS }],
       /** This must align to Cluster version: {@link version} */
-      kubectlLayer: new KubectlV29Layer(this, 'KubeCtlLayer'),
+      kubectlLayer: new KubectlV30Layer(this, 'KubeCtlLayer'),
       /** To prevent IP exhaustion when running huge workflows run using ipv6 */
       ipFamily: IpFamily.IP_V6,
       clusterLogging: [ClusterLoggingTypes.API, ClusterLoggingTypes.CONTROLLER_MANAGER, ClusterLoggingTypes.SCHEDULER],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "test": "node --import tsx --test infra/**/*.test.ts templates/common/__test__/*.test.ts"
   },
   "devDependencies": {
-    "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
+    "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.1",
     "@aws-sdk/client-cloudformation": "3.658.1",
     "@aws-sdk/client-eks": "3.658.1",
     "@aws-sdk/client-ssm": "3.658.1",
@@ -33,7 +33,7 @@
     "aws-cdk-lib": "2.160.x",
     "cdk8s": "^2.69.5",
     "cdk8s-cli": "^2.198.228",
-    "cdk8s-plus-29": "^2.5.5",
+    "cdk8s-plus-30": "^2.2.5",
     "constructs": "^10.3.0",
     "tsx": "^4.6.2"
   }