Skip to content

feat(eks): support eks with k8s 1.33 #34602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 16, 2025
Merged

feat(eks): support eks with k8s 1.33 #34602

merged 5 commits into from
Jun 16, 2025

Conversation

phuhung273
Copy link
Contributor

@phuhung273 phuhung273 commented Jun 1, 2025

Issue # (if applicable)

Relates #34520

Reason for this change

https://aws.amazon.com/about-aws/whats-new/2025/05/amazon-eks-distro-kubernetes-version-1-33/

Description of changes

Describe any new or updated permissions being added

Description of how you validated changes

import * as ec2 from 'aws-cdk-lib/aws-ec2';
import * as iam from 'aws-cdk-lib/aws-iam';
import { App, Stack } from 'aws-cdk-lib';
import { KubectlV33Layer } from '@aws-cdk/lambda-layer-kubectl-v33';
import * as eks from 'aws-cdk-lib/aws-eks';
import { Construct } from 'constructs';

export class EksClusterLatestVersion extends Stack {
  constructor(scope: Construct, id: string) {
    super(scope, id);

    const vpc = new ec2.Vpc(this, 'Vpc', { natGateways: 1 });
    const mastersRole = new iam.Role(this, 'Role', {
      assumedBy: new iam.AccountRootPrincipal(),
    });

    const cluster = new eks.Cluster(this, 'Cluster', {
      vpc,
      mastersRole,
      version: eks.KubernetesVersion.V1_33,
      kubectlLayer: new KubectlV33Layer(this, 'KubectlLayer'),
      defaultCapacity: 0,
    });

    cluster.addNodegroupCapacity('MNG_AL2023_X86_64_STANDARD', {
      amiType: eks.NodegroupAmiType.AL2023_X86_64_STANDARD,
    });
  }
}

const app = new App();

new EksClusterLatestVersion(app, 'v33-stack');
$ kubectl get no
NAME                           STATUS   ROLES    AGE   VERSION
ip-10-0-156-223.ec2.internal   Ready    <none>   32m   v1.33.0-eks-802817d
ip-10-0-240-123.ec2.internal   Ready    <none>   32m   v1.33.0-eks-802817d

$ kubectl get po --all-namespaces
NAMESPACE     NAME                       READY   STATUS    RESTARTS   AGE
kube-system   aws-node-q96bx             2/2     Running   0          32m
kube-system   aws-node-smkp7             2/2     Running   0          32m
kube-system   coredns-5d849c4789-5wd79   1/1     Running   0          36m
kube-system   coredns-5d849c4789-rwklp   1/1     Running   0          36m
kube-system   kube-proxy-4nmx8           1/1     Running   0          32m
kube-system   kube-proxy-jg778           1/1     Running   0          32m

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team June 1, 2025 07:20
@github-actions github-actions bot added p2 star-contributor [Pilot] contributed between 25-49 PRs to the CDK labels Jun 1, 2025
@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jun 1, 2025
@ykethan ykethan mentioned this pull request Jun 5, 2025
2 tasks
@phuhung273
Copy link
Contributor Author

Thanks for your review @mazyu36

@aws-cdk-automation aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels Jun 6, 2025
@shashank-boyapally
Copy link

Hi Team, is there any update on this PR for support for 1.33. We are blocked on some workflows.

@leonmk-aws leonmk-aws self-assigned this Jun 13, 2025
leonmk-aws
leonmk-aws previously approved these changes Jun 13, 2025
Copy link
Contributor

@leonmk-aws leonmk-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution, approved the PR

Copy link
Contributor

mergify bot commented Jun 13, 2025

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).

@mergify mergify bot dismissed leonmk-aws’s stale review June 13, 2025 15:11

Pull request has been modified.

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jun 13, 2025
@phuhung273 phuhung273 requested a review from leonmk-aws June 13, 2025 15:45
@phuhung273
Copy link
Contributor Author

Thanks for taking a look @leonmk-aws. Can you help reapprove, the latest commit is just to resolve conflict.

leonmk-aws
leonmk-aws previously approved these changes Jun 16, 2025
Copy link
Contributor

@leonmk-aws leonmk-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-approved, edit: seems that there are still conflicts @phuhung273

Copy link
Contributor

mergify bot commented Jun 16, 2025

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).

@mergify mergify bot dismissed leonmk-aws’s stale review June 16, 2025 12:01

Pull request has been modified.

@phuhung273
Copy link
Contributor Author

Thanks @leonmk-aws, conflict fixed. But the new check is failing, I tried git add --renormalize . as instructed in #34726 but cannot see any change. Not sure if this check is required.

@leonmk-aws
Copy link
Contributor

leonmk-aws commented Jun 16, 2025

Thanks @leonmk-aws, conflict fixed. But the new check is failing, I tried git add --renormalize . as instructed in #34726 but cannot see any change. Not sure if this check is required.

A new Github action was added that checks if everything is ok with git lfs files, do you have git lfs installed ?

If after installing it it and retrying git add --renormalize . command you still get the same error, you could try git lfs migrate import --no-rewrite <path to files that make the gh action fail>

@phuhung273
Copy link
Contributor Author

Thanks @leonmk-aws for your guidance. Hope thing can go smooth.

@leonmk-aws
Copy link
Contributor

Thanks @leonmk-aws for your guidance. Hope thing can go smooth.

It seems you have solved the LFS issue, which command did you use to fix it (renormalize or lfs migrate) ? I'll add it to our contributing guide as I suspect a lot of people will run into this issue

Copy link
Contributor

mergify bot commented Jun 16, 2025

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).

@phuhung273
Copy link
Contributor Author

It seems you have solved the LFS issue, which command did you use to fix it (renormalize or lfs migrate) ? I'll add it to our contributing guide as I suspect a lot of people will run into this issue

The one you suggested @leonmk-aws git lfs migrate import --no-rewrite <path to files that make the gh action fail>

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: e05f28a
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

mergify bot commented Jun 16, 2025

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).

@mergify mergify bot merged commit fc46733 into aws:main Jun 16, 2025
16 of 17 checks passed
Copy link
Contributor

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@phuhung273 phuhung273 deleted the eks-133 branch June 16, 2025 14:31
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 16, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
p2 star-contributor [Pilot] contributed between 25-49 PRs to the CDK
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants