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

fix(eks): cluster deployment issue when the authentication mode is not changing #33680

Merged
merged 5 commits into from
Mar 5, 2025

Conversation

xazhao
Copy link
Contributor

@xazhao xazhao commented Mar 4, 2025

Reason for this change

The issue happens in a very small edge case:

  1. create a eks.Cluster like this
new eks.Cluster(this, 'Cluster', {
    version: eks.KubernetesVersion.V1_32,
    kubectlLayer: new KubectlV32Layer(this, 'KubectlLayer'),
});
  1. In EKS console, modify the Auth model from CONFIG_MAP to API_AND_CONFIG_MAP, wait a few minutes until it completes.

  2. Again, update from API_AND_CONFIG_MAP to API from console, wait until it completes

  3. Now in CDK, add

authenticationMode: eks.AuthenticationMode.API,
  1. When we re-deploy, CDK would have a validation error:
Received response status [FAILED] from custom resource. Message returned: Cannot update from undefined(CONFIG_MAP) to API

It is because in local template, the auth mode is Config_Map while the actual resource is using API mode. In this case, cdk deployment should ignore the update instead of throwing an error.

Description of changes

Move the code order a little bit. Basically check if the updated auth mode is the same as existing mode first then do some validations.

Description of how you validated changes

Existing unit tests/integration tests passed. I removed 2 unit tests which are not applicable because DescribeCluster api call will always return auth mode.

Manually tested the change in the edge case.

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 March 4, 2025 00:37
@github-actions github-actions bot added the p2 label Mar 4, 2025
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Mar 4, 2025
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.

(This review is outdated)

Copy link

codecov bot commented Mar 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.21%. Comparing base (50ba3ef) to head (f538c20).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #33680   +/-   ##
=======================================
  Coverage   82.21%   82.21%           
=======================================
  Files         119      119           
  Lines        6876     6876           
  Branches     1162     1162           
=======================================
  Hits         5653     5653           
  Misses       1120     1120           
  Partials      103      103           
Flag Coverage Δ
suite.unit 82.21% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk ∅ <ø> (∅)
packages/aws-cdk-lib/core 82.21% <ø> (ø)

@xazhao xazhao marked this pull request as ready for review March 4, 2025 23:50
@xazhao xazhao added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Mar 5, 2025
@aws-cdk-automation aws-cdk-automation dismissed their stale review March 5, 2025 00:08

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

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Mar 5, 2025
@paulhcsun
Copy link
Contributor

Could you clarify the sentence When we re-deploy, CDK would consider it a undefined(CONFIG_MAP) to API and blocked with? Looks like it was cut off, the information will help to understand the re-ordering.

@xazhao
Copy link
Contributor Author

xazhao commented Mar 5, 2025

Could you clarify the sentence When we re-deploy, CDK would consider it a undefined(CONFIG_MAP) to API and blocked with? Looks like it was cut off, the information will help to understand the re-ordering.

Thanks! Updated.

@paulhcsun
Copy link
Contributor

@merigyfio update

@paulhcsun
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Mar 5, 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).

Copy link
Contributor

mergify bot commented Mar 5, 2025

update

☑️ Nothing to do

  • queue-position = -1 [📌 update requirement]
  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]

Copy link
Contributor

mergify bot commented Mar 5, 2025

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@paulhcsun
Copy link
Contributor

@Mergifyio update

Copy link
Contributor

mergify bot commented Mar 5, 2025

update

☑️ Nothing to do

  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]
  • queue-position = -1 [📌 update requirement]

Copy link
Contributor

mergify bot commented Mar 5, 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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Mar 5, 2025
Copy link
Contributor

mergify bot commented Mar 5, 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 ba2dfd1 into aws:main Mar 5, 2025
23 checks passed
Copy link
Contributor

mergify bot commented Mar 5, 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).

Copy link

github-actions bot commented Mar 5, 2025

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 5, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
contribution/core This is a PR that came from AWS. p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants