From 68db36d8f9c5d43d7ec9dd9306dbe3e2c00ddf7a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 30 Sep 2024 12:52:55 +1300 Subject: [PATCH] build: Update EKS from 29 to 30 TDE-1255 --- infra/charts/argo.extras.ts | 2 +- infra/charts/argo.workflows.ts | 2 +- infra/charts/cloudflared.ts | 2 +- infra/charts/event.exporter.ts | 4 +-- infra/charts/kube-system.coredns.ts | 2 +- infra/charts/kube-system.node.local.dns.ts | 2 +- infra/eks/cluster.ts | 6 ++--- package-lock.json | 30 +++++++++++----------- package.json | 4 +-- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/infra/charts/argo.extras.ts b/infra/charts/argo.extras.ts index 23d59d3c..74136fe7 100644 --- 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 index 5aff0e45..8758297c 100644 --- 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 index 5dd674d8..96f3b334 100644 --- 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 index 4bd0e61c..e7f3a696 100644 --- 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 index e2a30ab8..7551a755 100644 --- 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 index 588723bf..2cff82cb 100644 --- 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 index 52870f87..962ee669 100644 --- 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 index 344b6977..1227eaba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.2", "license": "MIT", "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", @@ -19,7 +19,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" }, @@ -89,14 +89,14 @@ "node": ">=10" } }, - "node_modules/@aws-cdk/lambda-layer-kubectl-v29": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v29/-/lambda-layer-kubectl-v29-2.1.0.tgz", - "integrity": "sha512-YwSyM3eNK5DiEY+5HWzVmkLzEMFSyTpsBSqki/kNePwH+UXP//Nmee2vMEIYxNFW6tpN3dx+B4gYNiJhBwGhKQ==", + "node_modules/@aws-cdk/lambda-layer-kubectl-v30": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v30/-/lambda-layer-kubectl-v30-2.0.1.tgz", + "integrity": "sha512-R4N2OTq9jCxARAmrp2TBNRkVreVa01wgAC4GNRRfZ8C4UD5+Cz+vylIyyJsVPD7WWZpdBSWDidnVMpvwTpAsQQ==", "dev": true, "license": "Apache-2.0", "peerDependencies": { - "aws-cdk-lib": "^2.94.0", + "aws-cdk-lib": "^2.85.0", "constructs": "^10.0.5" } }, @@ -3194,10 +3194,10 @@ "concat-map": "0.0.1" } }, - "node_modules/cdk8s-plus-29": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/cdk8s-plus-29/-/cdk8s-plus-29-2.5.5.tgz", - "integrity": "sha512-/id21yLH/xaa53vnun3ucp3bhiZ1Gp8zbWW2guc4gbY2RibKjrAhwFtnFXkleWB/KLnW/CzxAWeqsRp+08g6rw==", + "node_modules/cdk8s-plus-30": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/cdk8s-plus-30/-/cdk8s-plus-30-2.2.5.tgz", + "integrity": "sha512-uAraj0dBF+1pVSj5CCu4NvJnQvgjBGtzkmPrvyb6V4mIclSdsfh+PRcm3WgaX8g16k6YE6pMQnuc3PAQYVXCyA==", "bundleDependencies": [ "minimatch" ], @@ -3214,19 +3214,19 @@ "constructs": "^10.3.0" } }, - "node_modules/cdk8s-plus-29/node_modules/balanced-match": { + "node_modules/cdk8s-plus-30/node_modules/balanced-match": { "version": "1.0.2", "dev": true, "inBundle": true, "license": "MIT" }, - "node_modules/cdk8s-plus-29/node_modules/concat-map": { + "node_modules/cdk8s-plus-30/node_modules/concat-map": { "version": "0.0.1", "dev": true, "inBundle": true, "license": "MIT" }, - "node_modules/cdk8s-plus-29/node_modules/minimatch": { + "node_modules/cdk8s-plus-30/node_modules/minimatch": { "version": "3.1.2", "dev": true, "inBundle": true, @@ -3238,7 +3238,7 @@ "node": "*" } }, - "node_modules/cdk8s-plus-29/node_modules/minimatch/node_modules/brace-expansion": { + "node_modules/cdk8s-plus-30/node_modules/minimatch/node_modules/brace-expansion": { "version": "1.1.11", "dev": true, "inBundle": true, diff --git a/package.json b/package.json index 967edcc7..f9b9be51 100644 --- 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" }