Skip to content
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

feat(eks): support for Kubernetes version 1.22 #22604

Merged
merged 19 commits into from Oct 25, 2022
Merged

Conversation

madeline-k
Copy link
Contributor

@madeline-k madeline-k commented Oct 21, 2022

Add support for Kubernetes Version 1.22. In order to use this version, customers must pass in a KubectlLayer object from @aws-cdk/lambda-layer-kubectl-v22 to the kubectlLayer construct prop of Cluster.

Closes #20263


All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

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

rix0rrr and others added 10 commits October 19, 2022 15:40
The EKS Cluster construct has a property called `kubectlLayer`. When this
property was not given, it would add a two default layers to the custom
resource:

- One with kubectl
- One with the AWS CLI

However, if the property was given, the one layer must contain both
kubectl as well as the AWS CLI.

This makes the `kubectl` layer unnecessarily large -- it must also
contain the AWS CLI which the CDK already has and can bundle itself.

Add a separate `awscliLayer` parameter to control the AWS CLI layer,
if the user so wants. If not, the default AWS CLI layer will be added.

If some user is already using a `kubectlLayer` which includes the AWS
CLI, we now add both the default AWS CLI layer as well as the user's
kubectl layer with the AWS CLI in it. There is no conflict: multiple
layers can contain the same files.  Last layer wins (which is the
kubectl layer with the user's preferred AWS CLI).
Co-authored-by: Eli Polonsky <epolon@amazon.com>
…ws-cdk into huijbers/eks-separate-awscli-layer
@gitpod-io
Copy link

gitpod-io bot commented Oct 21, 2022

@github-actions github-actions bot added the p2 label Oct 21, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team October 21, 2022 15:31
@madeline-k madeline-k requested review from a team and removed request for a team October 21, 2022 15:31
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 21, 2022
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

Copy link
Contributor

@MrArnoldPalmer MrArnoldPalmer left a comment

Choose a reason for hiding this comment

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

I would add a section to the readme here about providing custom kubectl CLI versions. I think important things to call out are.

  1. The version of kubectl provided must be compatible with the Kubernetes version that the cluster is using.
  2. A basic code example of importing the kubectl asset package and passing to the appropriate prop.

@madeline-k madeline-k added the pr/do-not-merge This PR should not be merged at this time. label Oct 21, 2022
@aws-cdk-automation aws-cdk-automation dismissed their stale review October 21, 2022 17:49

✅ Updated pull request passes all PRLinter validations. Dissmissing previous PRLinter review.

Copy link
Contributor

@MrArnoldPalmer MrArnoldPalmer left a comment

Choose a reason for hiding this comment

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

🎉

Base automatically changed from huijbers/eks-separate-awscli-layer to main October 21, 2022 20:30
@henrysachs
Copy link

can we include 1.23 also in this pr? I think #22544 tried something like that but your PR is more "complete".

@madeline-k
Copy link
Contributor Author

can we include 1.23 also in this pr? I think #22544 tried something like that but your PR is more "complete".

@henrysachs , we are planning to do 1.23 and 1.24 in the same manner as this. But, those will come in subsequent PRs.

@madeline-k madeline-k removed the p2 label Oct 25, 2022
@github-actions github-actions bot added the effort/small Small work item – less than a day of effort label Oct 25, 2022
@github-actions github-actions bot added feature-request A feature should be added or improved. p1 labels Oct 25, 2022
@madeline-k madeline-k removed feature-request A feature should be added or improved. effort/small Small work item – less than a day of effort labels Oct 25, 2022
@madeline-k madeline-k removed the pr/do-not-merge This PR should not be merged at this time. label Oct 25, 2022
@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2022

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

@github-actions github-actions bot added effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. labels Oct 25, 2022
@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2022

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@mergify mergify bot merged commit 91704aa into main Oct 25, 2022
@mergify mergify bot deleted the madeline-k/kubernetes-v22 branch October 25, 2022 21:47
@mergify
Copy link
Contributor

mergify bot commented Oct 25, 2022

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. p1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(eks): support latest EKS engine version v1.22
6 participants