-
Notifications
You must be signed in to change notification settings - Fork 196
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
USHIFT-3459: Passthrough kubelet config from microshift config #3522
USHIFT-3459: Passthrough kubelet config from microshift config #3522
Conversation
@pmtk: This pull request references USHIFT-3459 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set. In response to this: 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 openshift-eng/jira-lifecycle-plugin repository. |
cb3e704
to
4c71f72
Compare
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.
A couple non-blocker nits, otherwise lgtm!
@@ -91,6 +92,7 @@ ingress: | |||
routeAdmissionPolicy: | |||
namespaceOwnership: InterNamespaceAllowed | |||
status: Managed | |||
kubelet: |
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.
It makes sense to specify the kubelet
key in the configuration example (L39), though it seems awkward to set it in the generated default config file. Ofc this is purely a manner of taste, as it wouldn't affect the processing logic one way or the other.
wdyt?
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 agree that an example would be nice, but it seems very manual process compared to what we have now. Also, current examples are showing default values, which still holds true for current kubelet:
.
I don't see elegant way to do this, or a way to not confuse users, but we'll definitely explain this feature in the official docs.
WDYT, can we skip this one?
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.
can you force it to have a null
value? This makes it to the default config and we need to be able to load it without issues.
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.
Empty object such as example below is a valid yaml AFAIK, is it not?
kubelet:
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 double checked and kubelet:
loads just fine and personally I prefer it to kubelet: null
4c71f72
to
eda9e00
Compare
eda9e00
to
2cc1a91
Compare
/hold |
/retest |
1 similar comment
/retest |
/unhold |
@@ -91,6 +92,7 @@ ingress: | |||
routeAdmissionPolicy: | |||
namespaceOwnership: InterNamespaceAllowed | |||
status: Managed | |||
kubelet: |
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.
can you force it to have a null
value? This makes it to the default config and we need to be able to load it without issues.
@@ -48,6 +48,10 @@ type Config struct { | |||
Manifests Manifests `json:"manifests"` | |||
Ingress IngressConfig `json:"ingress"` | |||
|
|||
// Settings specified in this section are transferred as-is into the Kubelet config. | |||
// +kubebuilder:validation:Schemaless | |||
Kubelet map[string]any `json:"kubelet"` |
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.
// +kubebuilder:default=null
Given that you already have schemaless you can put whatever you want here, meaning null
should work.
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.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: pacevedom, pmtk 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 |
@pmtk: all tests passed! Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
No description provided.