chore: add k8s 1.24+ taints
Add new node-role.kubernetes.io/control-plane taints so that the
cloud controller tolerates them.
Signed-off-by: Noel Georgi [email protected]
Fixes: #430
@frezbo: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.
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/test-infra repository.
The committers listed above are authorized under a signed CLA.
- :white_check_mark: login: frezbo / name: Noel Georgi (9a42ef1cb77ab565581e51807257715a4636cc31)
Welcome @frezbo!
It looks like this is your first PR to kubernetes/cloud-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/cloud-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. :smiley:
Hi @frezbo. Thanks for your PR.
I'm waiting for a kubernetes 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/test-infra repository.
I don't think this is sufficient to fix #430 - the issue is not only the tolerations, but also the nodeSelector. The nodeSelector should also be switched to node-role.kubernetes.io/control-plane. This would break compatibility with k8s < 1.20 (not a problem for me, but maybe for others). Perhaps it is possible to do this in a backwards compatible way with nodeAffinity.
I don't think this is sufficient to fix #430 - the issue is not only the
tolerations, but also thenodeSelector. ThenodeSelectorshould also be switched tonode-role.kubernetes.io/control-plane. This would break compatibility with k8s < 1.20 (not a problem for me, but maybe for others). Perhaps it is possible to do this in a backwards compatible way withnodeAffinity.
I'm not sure how to put in a fix without breaking backward compatibility, another option is to move forward with the new naming and add a breaking note in the release.
It would only affect verions <= 1.19, which went EOL October 2021, so I would support just moving forward. However on EKS 1.19 is supported until August 2022.
@kwohlfahrt I have updated the PR and ended up using nodeAffinity since it's OR'ed. So this should still work for old k8s. I've also fixed up the helm values file, so it installs properly out of the box.
I have tested this in k8s 1.23 and also 1.25 alpha and confirmed that it works on clusters that has the old taints/labels and also on clusters that has the new taints/labels
/assign
/assign @nckturner
hI @frezbo @nckturner any chance this is getting pushed forward? Currently running into this in a couple clusters where the master role no longer exists.
@mikescholl-sysdig I'm also waiting on the maintainers
Sorry for the delay.
/triage accepted /ok-to-test
/home/prow/go/src/k8s.io/cloud-provider-aws
./hack/e2e/run.sh: line 149: /home/prow/go/src/k8s.io/cloud-provider-aws/_output/test/20220819181918/kops: No such file or directory
seems like an unrelated failure? :thinking:
/test pull-cloud-provider-aws-e2e
@frezbo you'll need to rebase, the above failure was fixed in master.
[APPROVALNOTIFIER] This PR is NOT APPROVED
This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from nckturner by writing /assign @nckturner in a comment. For more information see:The Kubernetes Code Review Process.
The full list of commands accepted by this bot can be found here.
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
We should bump the chart version as well, shouldn't we?
We should bump the chart version as well, shouldn't we?
Does 0.0.7 sound fine?
Updated the chart version to 0.0.7 and also fixed the e2e test failure.
@nckturner this should be good to go
@frezbo: PR needs rebase.
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/test-infra repository.
closing in favor of https://github.com/kubernetes/cloud-provider-aws/pull/466
Sorry I missed this one. I was sort of going through my mailbox latest to oldest and #466 appeared first.
@olemarkus FYI #466 is not an ideal solution since you will now break K8S versions older than 1.24 that do not have the control-plane taints. It is also impossible to clear that setting when its set in the values.yaml