add support for minimumKubeletVersion #4980

haircommander · 2024-10-24T20:42:31Z

What this PR does / why we need it:
Add support for minimum kubelet version
carries openshift/api#2059 and #4927

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.
Relevant issues have been referenced.
This change includes docs.
This change includes unit tests.

netlify · 2024-10-24T20:44:01Z

✅ Deploy Preview for hypershift-docs ready!

Name	Link
🔨 Latest commit	`f346983`
🔍 Latest deploy log	https://app.netlify.com/sites/hypershift-docs/deploys/674098de933bb60008913bdf
😎 Deploy Preview	https://deploy-preview-4980--hypershift-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

openshift-ci · 2024-10-24T20:52:28Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: haircommander
Once this PR has been reviewed and has the lgtm label, please assign bryan-cox for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

enxebre · 2024-10-25T11:07:59Z

/hold
Let's make sure we get openshift/api#2059 in first

enxebre · 2024-11-04T10:30:50Z

control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go

+}
+
+// A helper function to factor out the pieces that rely on a functioning guest cluster, added for unit testing purposes.
+func (r *HostedControlPlaneReconciler) getHostedClusterNodesClient(ctx context.Context, hc *hyperv1.HostedControlPlane) (corev1client.NodesGetter, error) {


hypershift cohesively groups adhoc controllers that need to reconcile guest cluster resources within the hostedclusterconfigoperator.
See https://github.com/openshift/hypershift/tree/main/control-plane-operator/hostedclusterconfigoperator/controllers/nodecount

Please add the logic to set the current minimum version in the HCP.status there (similar to what we are doing for node count). Ideally this logic would run its own controller that is instantiated here https://github.com/openshift/hypershift/blob/main/control-plane-operator/hostedclusterconfigoperator/controllers/nodecount/setup.go#L22 so then we can run it only when the MinimumKubeletVersion gate is enabled

are you opposed to me running it in https://github.com/openshift/hypershift/blob/main/control-plane-operator/hostedclusterconfigoperator/controllers/node/node.go instead and gating that behavior on the feature gate, to reduce bolierplate?

alrighty we chatted offline and the new controller was suggested, so I've adopted that and used that to pass the oldestKubeletVersion to the HCP controller

enxebre · 2024-11-05T21:52:59Z

api/hypershift/v1beta1/hosted_controlplane.go

@@ -303,6 +303,9 @@ type HostedControlPlaneStatus struct {

 	// NodeCount tracks the number of nodes in the HostedControlPlane.
 	NodeCount *int `json:"nodeCount,omitempty"`
+
+	// OldestKubeletVersion tracks the oldest kubelet version in a hosted cluster


This must be behind the featuregate marker and we will want the same feature gated field within the the HostedCluster. So we can bubble it up. HCP is an imple detail. HC is consumer facing.

I'm curious what you're imagining the data flow to be. kubelet versions -> HostedCluster -> HostedControlPlane, or kubelet versions -> HostedControlPlane -> Hosted Cluster or kubelet versions -> HostedCluster ; kubelet versions - > HostedControlPlane

I think I'm confused why we need to involve the HostedCluster object at all here. HCP has the client connection and has the oldestKubeletVersion field, so it can validate the minimumKubeletversion and set a condition on the HCP object. It seems to me that when HCP condition is set, that will bubble up to the HC object which will then get exposed. Why do we need an additional field + additional controller for that field and potentially duplicate the checks

* Ignition to 2.18.0 * openshift/api and client-go to the most recent commit on November 18th 2024. * k8s to v0.31.1 * CAPI to v1.8.4 * controller-runtime to v0.19.0 And then run `go mod tidy && go mod vendor`, `make update` and `UPDATE=true go test ./...`.

Signed-off-by: Peter Hunt <pehunt@redhat.com>

haircommander · 2024-11-27T17:02:26Z

/retest

Signed-off-by: Peter Hunt <pehunt@redhat.com>

…Version Signed-off-by: Peter Hunt <pehunt@redhat.com>

Signed-off-by: Peter Hunt <pehunt@redhat.com>

openshift-merge-robot · 2024-12-12T20:53:32Z

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-sigs/prow repository.

openshift-ci · 2024-12-16T20:40:28Z

@haircommander: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-4-17	`da6b335`	link	true	`/test e2e-aws-4-17`
ci/prow/e2e-aws-4-18	`c6064b9`	link	true	`/test e2e-aws-4-18`
ci/prow/e2e-kubevirt-aws-ovn-reduced	`c6064b9`	link	true	`/test e2e-kubevirt-aws-ovn-reduced`
ci/prow/verify	`c6064b9`	link	true	`/test verify`
ci/prow/e2e-aws	`c6064b9`	link	true	`/test e2e-aws`
ci/prow/unit	`c6064b9`	link	true	`/test unit`
ci/prow/e2e-aws-override	`c6064b9`	link	true	`/test e2e-aws-override`
ci/prow/e2e-aks	`c6064b9`	link	true	`/test e2e-aks`
ci/prow/e2e-aws-upgrade-hypershift-operator	`c6064b9`	link	true	`/test e2e-aws-upgrade-hypershift-operator`

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-ci bot added do-not-merge/needs-area do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Oct 24, 2024

openshift-ci bot requested review from isco-rodriguez and nirarg October 24, 2024 20:52

openshift-ci bot added area/ci-tooling Indicates the PR includes changes for CI or tooling area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release labels Oct 24, 2024

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 25, 2024

enxebre mentioned this pull request Oct 28, 2024

add minimumKubeletVersion openshift/api#2059

Merged

haircommander force-pushed the min-kubelet-version branch from 3cff2d0 to 15edc8e Compare October 29, 2024 16:23

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2024

openshift-ci bot added area/api Indicates the PR includes changes for the API area/testing Indicates the PR includes changes for e2e testing labels Oct 29, 2024

haircommander force-pushed the min-kubelet-version branch from 15edc8e to 8ee6f25 Compare October 29, 2024 16:24

openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 29, 2024

enxebre reviewed Nov 4, 2024

View reviewed changes

haircommander force-pushed the min-kubelet-version branch from 8ee6f25 to b506416 Compare November 5, 2024 20:02

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2024

enxebre reviewed Nov 5, 2024

View reviewed changes

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2024

haircommander mentioned this pull request Nov 20, 2024

add support for minimumKubeletVersion openshift/library-go#1831

Merged

haircommander force-pushed the min-kubelet-version branch from 8e963e6 to 6a474be Compare November 21, 2024 19:12

haircommander force-pushed the min-kubelet-version branch from 6a474be to e46c0d3 Compare November 21, 2024 19:44

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2024

haircommander force-pushed the min-kubelet-version branch 3 times, most recently from 221d2ab to 39be3dd Compare November 22, 2024 14:36

haircommander changed the title ~~WIP: add support for minimumKubeletVersion~~ add support for minimumKubeletVersion Nov 22, 2024

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 22, 2024

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2024

EmilienM and others added 4 commits November 22, 2024 09:43

Update CPO, HO and support for new dependencies

ae22a61

vendor api and library-go changes for minimum kubelet version

5de3808

Signed-off-by: Peter Hunt <pehunt@redhat.com>

*: add clock to changed function

d6cecf8

Signed-off-by: Peter Hunt <pehunt@redhat.com>

haircommander force-pushed the min-kubelet-version branch from 39be3dd to f346983 Compare November 22, 2024 14:44

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2024

haircommander force-pushed the min-kubelet-version branch from f346983 to da6b335 Compare November 27, 2024 20:27

haircommander added 7 commits December 2, 2024 12:55

use NodeSpec in ClusterConfiguration

e4c7e5e

Signed-off-by: Peter Hunt <pehunt@redhat.com>

add featuregate for minimum kubelet verison

3983ff1

Signed-off-by: Peter Hunt <pehunt@redhat.com>

api: add oldestKubeletVersion

9e7cce0

Signed-off-by: Peter Hunt <pehunt@redhat.com>

add feature gate controller to HCCO

b74e50a

Signed-off-by: Peter Hunt <pehunt@redhat.com>

hostedcluster: bubble up OldestKubeletVersion from HCP

b1e7556

Signed-off-by: Peter Hunt <pehunt@redhat.com>

hostedcluster: set condition if OldestKubeletVersion < MinimumKubelet…

300bc91

…Version Signed-off-by: Peter Hunt <pehunt@redhat.com>

update fixtures

c6064b9

Signed-off-by: Peter Hunt <pehunt@redhat.com>

haircommander force-pushed the min-kubelet-version branch from da6b335 to c6064b9 Compare December 2, 2024 19:29

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add support for minimumKubeletVersion #4980

add support for minimumKubeletVersion #4980

haircommander commented Oct 24, 2024

netlify bot commented Oct 24, 2024 •

edited

Loading

openshift-ci bot commented Oct 24, 2024

enxebre commented Oct 25, 2024

enxebre Nov 4, 2024 •

edited

Loading

haircommander Nov 4, 2024

haircommander Nov 5, 2024

enxebre Nov 5, 2024 •

edited

Loading

haircommander Nov 6, 2024

haircommander Nov 6, 2024

haircommander commented Nov 27, 2024

openshift-merge-robot commented Dec 12, 2024

openshift-ci bot commented Dec 16, 2024

add support for minimumKubeletVersion #4980

Are you sure you want to change the base?

add support for minimumKubeletVersion #4980

Conversation

haircommander commented Oct 24, 2024

netlify bot commented Oct 24, 2024 • edited Loading

✅ Deploy Preview for hypershift-docs ready!

openshift-ci bot commented Oct 24, 2024

enxebre commented Oct 25, 2024

enxebre Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

haircommander Nov 4, 2024

Choose a reason for hiding this comment

haircommander Nov 5, 2024

Choose a reason for hiding this comment

enxebre Nov 5, 2024 • edited Loading

Choose a reason for hiding this comment

haircommander Nov 6, 2024

Choose a reason for hiding this comment

haircommander Nov 6, 2024

Choose a reason for hiding this comment

haircommander commented Nov 27, 2024

openshift-merge-robot commented Dec 12, 2024

openshift-ci bot commented Dec 16, 2024

netlify bot commented Oct 24, 2024 •

edited

Loading

enxebre Nov 4, 2024 •

edited

Loading

enxebre Nov 5, 2024 •

edited

Loading