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

USHIFT-3459: Passthrough kubelet config from microshift config #3522

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Jun 20, 2024

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 20, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 20, 2024

@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.

@openshift-ci openshift-ci bot requested review from jerpeter1 and jogeo June 20, 2024 11:17
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 20, 2024
@pmtk pmtk force-pushed the low-latency/kubelet-config-passthrough branch 2 times, most recently from cb3e704 to 4c71f72 Compare June 20, 2024 15:59
Copy link
Contributor

@copejon copejon left a 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:
Copy link
Contributor

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?

Copy link
Member Author

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?

Copy link
Contributor

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.

Copy link
Member Author

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:

Copy link
Member Author

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

pkg/node/kubelet.go Outdated Show resolved Hide resolved
@pmtk pmtk force-pushed the low-latency/kubelet-config-passthrough branch from 4c71f72 to eda9e00 Compare June 21, 2024 07:16
@pmtk pmtk force-pushed the low-latency/kubelet-config-passthrough branch from eda9e00 to 2cc1a91 Compare June 21, 2024 07:20
@pmtk
Copy link
Member Author

pmtk commented Jun 21, 2024

/hold
Let's think if we'd be better using new kubelet's drop-in dir cfg

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2024
@pmtk
Copy link
Member Author

pmtk commented Jun 24, 2024

/retest

1 similar comment
@pmtk
Copy link
Member Author

pmtk commented Jun 26, 2024

/retest

@pmtk
Copy link
Member Author

pmtk commented Jun 26, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 26, 2024
@@ -91,6 +92,7 @@ ingress:
routeAdmissionPolicy:
namespaceOwnership: InterNamespaceAllowed
status: Managed
kubelet:
Copy link
Contributor

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"`
Copy link
Contributor

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.

Copy link
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2024
Copy link
Contributor

openshift-ci bot commented Jul 12, 2024

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Jul 12, 2024

@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.

@openshift-merge-bot openshift-merge-bot bot merged commit 15d22b6 into openshift:main Jul 12, 2024
10 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants