cluster-api-provider-aws
cluster-api-provider-aws copied to clipboard
:bug: Remove Helm condition for AWS VPC CNI deletion
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: https://github.com/aws/amazon-vpc-cni-k8s/issues/2763#issuecomment-1908510232). 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 will need to set AWSManagedControlPlane.Spec.VpcCni.Disable to false (default).
Checklist:
- [x] squashed commits
- [ ] includes documentation
- [x] includes emojis
- [ ] adds unit tests
- [ ] adds or updates e2e tests
Release note:
Flag to remove the default Helm-managed AWS VPC CNI EKS Addon