-
Notifications
You must be signed in to change notification settings - Fork 193
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
helm: use correct nodeSelector for k8s 1.25+ #1360
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: jackfrancis The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@@ -26,7 +26,11 @@ spec: | |||
nodeSelector: | |||
kubernetes.io/os: linux | |||
{{- if .Values.controller.runOnMaster}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add a new runOnControlPlane
setting and have this line check if either is set and the apply the correct node-selector?
That is more work now but probably better in the long run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that would be a separate PR, but agree it would be good going forward.
@andyzhangx would you accept a follow-up PR with a new helm value controller.runOnControlPlane
, with comment that controller.runOnMaster
is deprecated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fair enough
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we could remove controller.runOnMaster
chart, replace with controller.runOnControlPlane
directly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Won't this break back-compat for existing users? (or has a new version of the chart w/ this configuration never been released?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's ok for chart config of new versions, add a new controller.runOnControlPlane
could be safer, and after a few versions, we could remove controller.runOnMaste
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about we do that as a follow-up change? in the meantime looks like we can merge this to fix broken tests
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the windows test failure should already be fixed by #1362, no worry, I will provide a fix using controller.runOnControlPlane
later
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR(#1366) would address the issue.
/lgtm (pending tests) |
this PR should have fixed the test failure on 1.25+: #1362 |
/retest |
@jackfrancis: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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 understand the commands that are listed here. |
What type of PR is this?
/kind failing-test
/kind api-change
What this PR does / why we need it:
This PR sets the correct nodeSelector in the helm chart so that it works with k8s 1.25+
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: