upgrade EKS from 1.29 to 1.31. upgrade CDK from 2.151.0 to 2.171.1

awslabs · Dec 7, 2024 · 965584c · 965584c
1 parent b9e8830
commit 965584c
Show file tree

Hide file tree

Showing 25 changed files with 1,231 additions and 1,320 deletions.
diff --git a/backstage-reference/common/aws_ecs/package.json b/backstage-reference/common/aws_ecs/package.json
@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/node": "^22.2.0",
-    "aws-cdk": "^2.151.0",
+    "aws-cdk": "^2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "^2.151.0",
+    "aws-cdk-lib": "^2.171.1",
     "constructs": "^10.3.0"
   }
-}
+}
diff --git a/backstage-reference/common/aws_eks/package.json b/backstage-reference/common/aws_eks/package.json
@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/node": "22.2.0",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0",
     "cdk-nag": "^2.28.177"
   }

diff --git a/backstage-reference/common/aws_gen_ai_rag/package.json b/backstage-reference/common/aws_gen_ai_rag/package.json
@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/node": "^22.2.0",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0"
   }
 }
diff --git a/backstage-reference/common/aws_rds/package.json b/backstage-reference/common/aws_rds/package.json
@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/node": "22.2.0",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21"
   }

diff --git a/backstage-reference/common/aws_s3/package.json b/backstage-reference/common/aws_s3/package.json
@@ -11,14 +11,14 @@
   },
   "devDependencies": {
     "@types/node": "^22.2.0",
-    "aws-cdk": "^2.151.0",
+    "aws-cdk": "^2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "^2.151.0",
+    "aws-cdk-lib": "^2.171.1",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21"
   }
-}
+}
diff --git a/backstage-reference/common/aws_secretsmanager/package.json b/backstage-reference/common/aws_secretsmanager/package.json
@@ -14,16 +14,16 @@
     "@types/jest": "^29.5.12",
     "@types/node": "22.2.0",
     "@types/uuid": "^10.0.0",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21",
     "uuid": "^10.0.0"
   }
-}
+}
diff --git a/backstage-reference/common/aws_serverless_api/package.json b/backstage-reference/common/aws_serverless_api/package.json
@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/node": "22.2.0",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws-sdk/util-arn-parser": "^3.568.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0"
   }
 }
diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-basic.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-basic.yml
@@ -10,7 +10,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-ecs-ec2.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-ecs-ec2.yml
@@ -9,7 +9,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-ecs.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-ecs.yml
@@ -10,7 +10,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-eks.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-eks.yml
@@ -10,7 +10,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"
@@ -31,8 +31,8 @@ iac-deployment-env-provider:
 
     - echo -e "\e[0Ksection_start:`date +%s`:get_kubectl[collapsed=true]\r\e[0KInstall Kubectl"
     - apt install sudo
-    - curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-    - echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
+    - curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.31/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+    - echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.31/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
     - sudo apt update
     - sudo apt install kubectl
     - echo -e "\e[0Ksection_end:`date +%s`:get_kubectl\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-gen-ai.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-gen-ai.yml
@@ -10,7 +10,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-provider-serverless.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-provider-serverless.yml
@@ -10,7 +10,7 @@ iac-deployment-env-provider:
     - apt install nodejs npm git python3-pip yq jq -y
     - export PIP_BREAK_SYSTEM_PACKAGES=1
     - pip3 install awscli --upgrade
-    - yarn global add aws-cli typescript@latest aws-cdk@2.151.0
+    - yarn global add aws-cli typescript@latest aws-cdk@2.171.1
     - yarn --version
     - aws --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools\r\e[0K"

diff --git a/backstage-reference/common/cicd/.gitlab-ci-job-defaults-cdk.yml b/backstage-reference/common/cicd/.gitlab-ci-job-defaults-cdk.yml
@@ -9,7 +9,7 @@ default:
     - echo -e "\e[0Ksection_start:`date +%s`:get_tools1[collapsed=true]\r\e[0KGet Tools"
     - apt-get update
     - apt install nodejs npm git python3-pip yq jq unzip -y
-    - yarn global add typescript@latest aws-cdk@2.151.0
+    - yarn global add typescript@latest aws-cdk@2.171.1
     - yarn --version
     - echo -e "\e[0Ksection_end:`date +%s`:get_tools1\r\e[0K"
 

diff --git a/backstage-reference/common/cicd/scripts/k8s/install-kubectl.sh b/backstage-reference/common/cicd/scripts/k8s/install-kubectl.sh
@@ -2,10 +2,10 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 echo -e "\e[0Ksection_start:`date +%s`:install_kubectl[collapsed=true]\r\e[0KInstalling kubectl";
 echo "Runtime Architecture: $(uname -m)"
-echo "Getting kubectl version v1.29.7 from https://dl.k8s.io/release/v1.29.7/bin/linux/amd64/kubectl"
-curl -LO "https://dl.k8s.io/release/v1.29.7/bin/linux/amd64/kubectl"
+echo "Getting kubectl version v1.31.7 from https://dl.k8s.io/release/v1.31.7/bin/linux/amd64/kubectl"
+curl -LO "https://dl.k8s.io/release/v1.31.7/bin/linux/amd64/kubectl"
 echo "Got kubectl. Getting kubectl sha hash."
-curl -LO "https://dl.k8s.io/release/v1.29.7/bin/linux/amd64/kubectl.sha256"
+curl -LO "https://dl.k8s.io/release/v1.31.7/bin/linux/amd64/kubectl.sha256"
 echo "Got kubectl sha hash. Compairing checksum."
 echo "$(cat kubectl.sha256)  kubectl" | sha256sum --check
 apt install sudo;

diff --git a/iac/roots/opa-basic-environment/package.json b/iac/roots/opa-basic-environment/package.json
@@ -19,15 +19,15 @@
     "@types/node": "^20.3.1",
     "@types/prettier": "2.6.0",
     "@types/source-map-support": "^0.5.6",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws/aws-app-development-common-constructs": "0.3.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0"
   }
-}
+}
diff --git a/iac/roots/opa-common-constructs/package.json b/iac/roots/opa-common-constructs/package.json
@@ -19,15 +19,15 @@
     "@types/node": "^20.3.1",
     "@types/prettier": "2.7.3",
     "@types/source-map-support": "^0.5.6",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.627.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "cdk-nag": "^2.28.175",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21"

diff --git a/iac/roots/opa-ecs-ec2-environment/package.json b/iac/roots/opa-ecs-ec2-environment/package.json
@@ -14,13 +14,13 @@
     "@types/node": "^20.3.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4",
     "@aws/aws-app-development-common-constructs": "0.3.0"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21",
     "@aws/aws-app-development-common-constructs": "0.3.0"

diff --git a/iac/roots/opa-ecs-environment/package.json b/iac/roots/opa-ecs-environment/package.json
@@ -14,13 +14,13 @@
     "@types/node": "^20.3.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4",
     "@aws/aws-app-development-common-constructs": "0.3.0"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21",
     "@aws/aws-app-development-common-constructs": "0.3.0"

diff --git a/iac/roots/opa-eks-environment/package.json b/iac/roots/opa-eks-environment/package.json
@@ -20,16 +20,16 @@
     "@types/node": "^20.3.1",
     "@types/prettier": "2.6.0",
     "@types/source-map-support": "^0.5.6",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "~2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws/aws-app-development-common-constructs": "0.3.0",
-    "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
-    "aws-cdk-lib": "2.151.0",
+    "@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
+    "aws-cdk-lib": "~2.171.1",
     "constructs": "^10.3.0"
   }
 }
diff --git a/iac/roots/opa-eks-environment/src/constructs/eks-env-cluster-construct.ts b/iac/roots/opa-eks-environment/src/constructs/eks-env-cluster-construct.ts
@@ -8,7 +8,7 @@ import * as eks from "aws-cdk-lib/aws-eks";
 import * as iam from "aws-cdk-lib/aws-iam";
 import * as ssm from "aws-cdk-lib/aws-ssm";
 import * as ec2 from "aws-cdk-lib/aws-ec2";
-import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
+import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
 import { OPAEnvironmentParams } from "@aws/aws-app-development-common-constructs";
 import {
   getCreateK8sOpaResources,
@@ -101,9 +101,9 @@ export class OPAEKSClusterConstruct extends Construct {
       eks.ClusterLoggingTypes.AUTHENTICATOR,
       eks.ClusterLoggingTypes.SCHEDULER,
     ];
-    const kubectlLayer = new KubectlV29Layer(this, 'kubectl');
+    const kubectlLayer = new KubectlV31Layer(this, 'kubectl');
     const albControllerVersion = eks.AlbControllerVersion.V2_6_2;
-    const kubernetesVersion = eks.KubernetesVersion.V1_29;
+    const kubernetesVersion = eks.KubernetesVersion.V1_31;
 
     const clusterAdminK8sUsername = props.clusterAdminRole.roleArn;
 

diff --git a/iac/roots/opa-gen-ai-environment/package.json b/iac/roots/opa-gen-ai-environment/package.json
@@ -19,15 +19,15 @@
     "@types/node": "^20.3.1",
     "@types/prettier": "2.6.0",
     "@types/source-map-support": "^0.5.6",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws/aws-app-development-common-constructs": "0.3.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0"
   }
 }
diff --git a/iac/roots/opa-platform/package.json b/iac/roots/opa-platform/package.json
@@ -17,7 +17,7 @@
     "@types/node": "^22.1.0",
     "@types/prettier": "^3.0.0",
     "@types/source-map-support": "^0.5.10",
-    "aws-cdk": "^2.151.0",
+    "aws-cdk": "^2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
@@ -28,9 +28,9 @@
     "@aws-sdk/client-s3": "^3.627.0",
     "@aws-sdk/client-ssm": "^3.624.0",
     "@aws/aws-app-development-common-constructs": "0.3.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "cdk-nag": "^2.28.175",
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21"
   }
-}
+}
diff --git a/iac/roots/opa-serverless-environment/package.json b/iac/roots/opa-serverless-environment/package.json
@@ -19,15 +19,15 @@
     "@types/node": "^20.3.1",
     "@types/prettier": "2.6.0",
     "@types/source-map-support": "^0.5.6",
-    "aws-cdk": "2.151.0",
+    "aws-cdk": "2.171.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
   "dependencies": {
     "@aws/aws-app-development-common-constructs": "0.3.0",
-    "aws-cdk-lib": "2.151.0",
+    "aws-cdk-lib": "2.171.1",
     "constructs": "^10.3.0"
   }
 }