feat(eks): add support for Kubernetes version 1.35#37065
feat(eks): add support for Kubernetes version 1.35#37065AndreKurait wants to merge 9 commits intoaws:mainfrom
Conversation
Signed-off-by: Andre Kurait <andrekurait@gmail.com>
There was a problem hiding this comment.
Pull request overview
Adds AWS CDK support for Amazon EKS Kubernetes v1.35 across the stable aws-eks module and the deprecated @aws-cdk/aws-eks-v2-alpha module, including wiring the corresponding kubectl Lambda layer into integration test utilities and documentation/examples.
Changes:
- Added
KubernetesVersion.V1_35constants toaws-cdk-lib/aws-eksand@aws-cdk/aws-eks-v2-alpha. - Updated READMEs/examples to use
KubectlV35Layer/@aws-cdk/lambda-layer-kubectl-v35. - Updated integration test framework version→kubectl-layer mapping and added
@aws-cdk/lambda-layer-kubectl-v35dependencies (plus lockfile update).
Reviewed changes
Copilot reviewed 9 out of 10 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| yarn.lock | Adds lock entry for @aws-cdk/lambda-layer-kubectl-v35@2.0.0. |
| packages/aws-cdk-lib/package.json | Updates rosetta example dependency from kubectl v34 to v35. |
| packages/aws-cdk-lib/aws-stepfunctions-tasks/README.md | Updates EKS Step Functions example to v1.35 + kubectl v35 layer. |
| packages/aws-cdk-lib/aws-eks/lib/cluster.ts | Adds KubernetesVersion.V1_35. |
| packages/aws-cdk-lib/aws-eks/README.md | Updates EKS README examples to v1.35 + kubectl v35 layer. |
| packages/@aws-cdk/aws-eks-v2-alpha/package.json | Adds kubectl v35 devDependency and updates rosetta example dependency. |
| packages/@aws-cdk/aws-eks-v2-alpha/lib/cluster.ts | Adds KubernetesVersion.V1_35. |
| packages/@aws-cdk/aws-eks-v2-alpha/README.md | Updates examples to v1.35 and kubectl v35 layer where applicable. |
| packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ-tests-kubernetes-version.ts | Extends version→layer map to include 1.35. |
| packages/@aws-cdk-testing/framework-integ/package.json | Adds dependency on @aws-cdk/lambda-layer-kubectl-v35. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: Andre Kurait <andrekurait@gmail.com>
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
Update helm 3.19.0 → 4.1.0 in kubectl-v35 snapshots to match the actual @aws-cdk/lambda-layer-kubectl-v35@2.0.0 package (which bundles helm 4.1.0 per cdklabs/awscdk-asset-kubectl#2669). Also update 16 remaining kubectl-v34 → kubectl-v35 references in packages/aws-cdk-lib/aws-eks-v2/README.md that were missed in the initial commit. Signed-off-by: Andre Kurait <andrekurait@gmail.com>
- Update v1 integ tests (eks-al2023-nodegroup, fargate-cluster) to V1_35 - Fix v2 integ tests to use KubernetesVersion.V1_35 (was missed) - Replace v34 kubectl layer zip with v35 across all 6 snapshot dirs - Update all assets.json, template.json, manifest.json, tree.json - Recompute template hashes in assets.json and manifest.json Signed-off-by: Andre Kurait <andrekurait@gmail.com>
… snapshots - Added missing V1_35 constant to aws-cdk-lib/aws-eks-v2 KubernetesVersion class - Regenerated v1 (aws-eks) integ test snapshots via yarn integ --update-on-failed - All 4 integ tests pass snapshot verification Signed-off-by: Andre Kurait <andrekurait@gmail.com>
…upport # Conflicts: # packages/@aws-cdk-testing/framework-integ/package.json # packages/@aws-cdk/aws-eks-v2-alpha/package.json
|
|
||||||||||||||||||||||
|
|
||||||||||||||||||
…upport # Conflicts: # packages/@aws-cdk/aws-eks-v2-alpha/README.md # packages/@aws-cdk/aws-eks-v2-alpha/lib/cluster.ts # packages/@aws-cdk/aws-eks-v2-alpha/package.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-test.assets.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-test.template.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-al2023-nodegroup.js.snapshot/manifest.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-al2023-nodegroup.js.snapshot/tree.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-al2023-nodegroup.ts # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.fargate-cluster.js.snapshot/eks-fargate-cluster-test-stack.assets.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.fargate-cluster.js.snapshot/eks-fargate-cluster-test-stack.template.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.fargate-cluster.js.snapshot/manifest.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.fargate-cluster.js.snapshot/tree.json # packages/@aws-cdk/aws-eks-v2-alpha/test/integ.fargate-cluster.ts
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Merge Queue StatusRule:
This pull request spent 5 seconds in the queue, with no time running CI. ReasonThe pull request can't be updated
HintYou should update or rebase your pull request manually. If you do, this pull request will automatically be requeued once the queue conditions match again. |
Pull request has been modified.
Issue # (if applicable)
Closes #36920
Reason for this change
Add Kubernetes 1.35 support to the EKS module, following the same pattern as PR #36016 (1.34 support).
Description of changes
Find-and-replace of all kubectl v34 → v35 references across the codebase, then
yarn integ --update-on-failedto regenerate integration test snapshots. The newkubectl-v35@2.0.0layer bundles kubectl 1.35.0 and helm 4.1.0 (bumped from 3.19.0, per cdklabs/awscdk-asset-kubectl#2669).Files touched:
cluster.tsmodules — addedV1_35toKubernetesVersioninaws-eksandaws-eks-v2aws-eks,aws-eks-v2,aws-stepfunctions-tasksinteg-tests-kubernetes-version.ts— addedKubectlV35Layerimport + version mapping.tsfiles — updated layer import and version constant (v1 + v2, fargate-cluster + eks-al2023-nodegroup)package.jsonfiles — added@aws-cdk/lambda-layer-kubectl-v35dependency (framework-integ,aws-cdk-lib)yarn integ --update-on-failed(deploys real EKS clusters)yarn.lock— updatedHow to reproduce for the next Kubernetes version (e.g., V1_36)
Prerequisites:
@aws-cdk/lambda-layer-kubectl-v36is published on npm (comes from cdklabs/awscdk-asset-kubectl)kubectl-layer.js) — update descriptions accordinglyStep 1: Add
V1_36version constant to 2 cluster.ts filesCopy the previous version's block and bump the version number:
packages/aws-cdk-lib/aws-eks/lib/cluster.tspackages/aws-cdk-lib/aws-eks-v2/lib/cluster.tsStep 2: Update
integ-tests-kubernetes-version.tsIn
packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ-tests-kubernetes-version.ts:import { KubectlV36Layer } from '@aws-cdk/lambda-layer-kubectl-v36';V1_36→KubectlV36LayermappingStep 3: Update integ test files
Find-and-replace
KubectlV35Layer→KubectlV36Layer,kubectl-v35→kubectl-v36, andV1_35→V1_36in:packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.tspackages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.tspackages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.eks-al2023-nodegroup.tspackages/@aws-cdk-testing/framework-integ/test/aws-eks-v2/test/integ.fargate-cluster.tsStep 4: Update READMEs
Find-and-replace all
kubectl-v35/KubectlV35/v35references →v36in:packages/aws-cdk-lib/aws-eks/README.mdpackages/aws-cdk-lib/aws-eks-v2/README.mdpackages/aws-cdk-lib/aws-stepfunctions-tasks/README.mdStep 5: Update
package.jsondependenciesAdd
@aws-cdk/lambda-layer-kubectl-v36(and updatejsiiRosetta.exampleDependencieswhere applicable):packages/@aws-cdk-testing/framework-integ/package.jsonpackages/aws-cdk-lib/package.jsonStep 6: Install and regenerate snapshots
yarn install # From packages/@aws-cdk-testing/framework-integ — requires AWS credentials: yarn integ --update-on-failed test/aws-eks/test/integ.eks-al2023-nodegroup.js yarn integ --update-on-failed test/aws-eks/test/integ.fargate-cluster.js yarn integ --update-on-failed test/aws-eks-v2/test/integ.eks-al2023-nodegroup.js yarn integ --update-on-failed test/aws-eks-v2/test/integ.fargate-cluster.jsStep 7: Commit, push, and open PR
Use the previous version bump PR as a reference for the PR title/description format.
Description of how you validated changes
yarn integ --update-on-failed— all 4 integ tests (v1 + v2, fargate-cluster + eks-al2023-nodegroup) deployed successfully and regenerated snapshotsRe-ran
integ-runner(synth-only comparison) — all 47 EKS integ tests returned UNCHANGED:test/aws-eks-v2test/aws-eksFollows the exact same file-change pattern as PR feat(eks): add support for Kubernetes version 1.34 #36016
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license