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

🐛 Remove Helm condition for AWS VPC CNI deletion #5009

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

jas-nik
Copy link
Contributor

@jas-nik jas-nik commented Jun 10, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:

Recently, AWS changed the way VPC CNI is installed from manifest apply to managing it via Helm (ref: aws/amazon-vpc-cni-k8s#2763 (comment)). This makes AWSManagedControlPlane.Spec.VpcCni.Disable flag obsolete due to the app.kubernetes.io/managed-by: Helm condition in deleteCNI flow.

This PR removes that condition to make the flag functional.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # 4743

Special notes for your reviewer:

For users replacing the default VPC CNI with their own helm-managed VPC CNI - They will need to set AWSManagedControlPlane.Spec.VpcCni.Disable to false (default) OR set label on VPC CNI resource "prevent-deletion": "true"

Checklist:

  • squashed commits
  • includes documentation
  • includes emojis
  • adds unit tests
  • adds or updates e2e tests

Release note:

Flag to remove the default Helm-managed AWS VPC CNI EKS Addon

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 10, 2024
Copy link

linux-foundation-easycla bot commented Jun 10, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: jas-nik / name: Jaswanth V (02198d3)

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-priority labels Jun 10, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @jas-nik!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 10, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jas-nik. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 10, 2024
@jas-nik
Copy link
Contributor Author

jas-nik commented Jun 11, 2024

/assign @nrb @richardcase

@nrb
Copy link
Contributor

nrb commented Jun 24, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. do-not-merge/contains-merge-commits and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 24, 2024
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed do-not-merge/contains-merge-commits size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 26, 2024
@jas-nik jas-nik force-pushed the vpc-cni-helm branch 2 times, most recently from 50a8860 to c3d33c5 Compare June 26, 2024 17:53
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 26, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 22, 2024
@jas-nik
Copy link
Contributor Author

jas-nik commented Jul 22, 2024

@richardcase - Done. Added a label prevent-deletion, please review when you get a chance.

@richardcase
Copy link
Member

/milestone v2.6.0

@k8s-ci-robot k8s-ci-robot added this to the v2.6.0 milestone Jul 22, 2024
@cnmcavoy
Copy link
Contributor

/lgtm

We probably need to document the label in the future.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2024
@richardcase
Copy link
Member

We probably need to document the label in the future.

Thats a good point @cnmcavoy . I think we should probably include documentation with this PR. wdyt @jas-nik @cnmcavoy ?

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2024
@jas-nik
Copy link
Contributor Author

jas-nik commented Jul 25, 2024

Updated pod networking doc

Copy link
Contributor

@AndiDog AndiDog left a comment

Choose a reason for hiding this comment

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

Minor wording comments, otherwise

/lgtm

pkg/cloud/services/awsnode/cni.go Outdated Show resolved Hide resolved
pkg/cloud/services/awsnode/cni.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2024
@richardcase
Copy link
Member

@jas-nik - thanks for the updates. Could you resolve the 2 open items and then i think we are good to go. Thank you so much for this.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2024
@jas-nik
Copy link
Contributor Author

jas-nik commented Jul 29, 2024

/retest

@richardcase
Copy link
Member

There was previous lgtm (and only a comment change) so:

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2024
@k8s-ci-robot k8s-ci-robot merged commit b8ad31c into kubernetes-sigs:main Jul 29, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants