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

OCPBUGS-54611: pkg/operator/status: Drop kubelet skew guard #4970

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

wking
Copy link
Member

@wking wking commented Apr 3, 2025

The kubelet skew guard is from 1471d2c (#2658). But the Kube API server also landed a similar guard in
openshift/cluster-kube-apiserver-operator@9ce4f74775 (openshift/cluster-kube-apiserver-operator#1199).
openshift/enhancements@0ba744e750 (openshift/enhancements#762) had shifted the proposal from MCO-guards to KAS-guards, so I'm not clear on why the MCO guard landed. This pull request drops it, to consolidate around the KAS-side guard.

Closes: OCPBUGS-54611

- What I did

Dropped the MCO's kubelet-skew guard, because the Kube API server's kubelet-skew guard is enough on its own.

- How to verify it

  1. Install a 4.19 cluster.
  2. Create a MachineConfigPool where you override the RHCOS image to use one from 4.17 (maybe there's some fancy MCO way to do this?).
  3. The cluster's kube-apiserver ClusterOperator will be Upgradeable=False, and oc adm upgrade will point out the old Nodes. Without this fix, the machine-config ClusterOperator will also be Upgradeable=False, and oc adm upgrade will be talking about the old-kubelet/Node issue for both ClusterOperators. With this fix, the machine-config ClusterOperator will not be Upgradeable=False, and oc adm upgrade will only talk about the kube-apiserver's old-kubelet/Node complaints.

- Description for the changelog

Probably not worth a change-log entry, because so few folks are likely to bump up against these skew constraints, and we're not adding or removing a guard at the OCP level, just simplifying the OCP-scoped messaging by consolidating around the KAS-side wording.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 3, 2025
@openshift-ci-robot
Copy link
Contributor

@wking: This pull request references Jira Issue OCPBUGS-54611, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

The kubelet skew guard is from 1471d2c (#2658). But the Kube API server also landed a similar guard in
openshift/cluster-kube-apiserver-operator@9ce4f74775 (openshift/cluster-kube-apiserver-operator#1199).
openshift/enhancements@0ba744e750 (openshift/enhancements#762) had shifted the proposal from MCO-guards to KAS-guards, so I'm not clear on why the MCO guard landed. This pull request drops it, to consolidate around the KAS-side guard.

Closes: OCPBUGS-54611

- What I did

Dropped the MCO's kubelet-skew guard, because the Kube API server's kubelet-skew guard is enough on its own.

- How to verify it

  1. Install a 4.19 cluster.
  2. Create a MachineConfigPool where you override the RHCOS image to use one from 4.17 (maybe there's some fancy MCO way to do this?).
  3. The cluster's kube-apiserver ClusterOperator will be Upgradeable=False, and oc adm upgrade will point out the old Nodes. Without this fix, the machine-config ClusterOperator will also be Upgradeable=False, and oc adm upgrade will be talking about the old-kubelet/Node issue for both ClusterOperators. With this fix, the machine-config ClusterOperator will not be Upgradeable=False, and oc adm upgrade will only talk about the kube-apiserver's old-kubelet/Node complaints.

- Description for the changelog

Probably not worth a change-log entry, because so few folks are likely to bump up against these skew constraints, and we're not adding or removing a guard at the OCP level, just simplifying the OCP-scoped messaging by consolidating around the KAS-side wording.

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.

Copy link
Contributor

openshift-ci bot commented Apr 3, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wking
Once this PR has been reviewed and has the lgtm label, please assign umohnani8 for approval. For more information see the 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:

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 Apr 3, 2025

@wking: 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-azure-ovn-upgrade-out-of-change cb44bcb link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/okd-scos-e2e-aws-ovn cb44bcb link false /test okd-scos-e2e-aws-ovn
ci/prow/images cb44bcb link true /test images
ci/prow/verify cb44bcb link true /test verify
ci/prow/unit cb44bcb link true /test unit
ci/prow/e2e-gcp-op-single-node cb44bcb link true /test e2e-gcp-op-single-node
ci/prow/bootstrap-unit cb44bcb link false /test bootstrap-unit
ci/prow/e2e-gcp-op-ocl cb44bcb link false /test e2e-gcp-op-ocl
ci/prow/e2e-agent-compact-ipv4 cb44bcb link false /test e2e-agent-compact-ipv4
ci/prow/e2e-aws-ovn-upgrade cb44bcb link true /test e2e-aws-ovn-upgrade
ci/prow/e2e-aws-ovn-upgrade-out-of-change cb44bcb link false /test e2e-aws-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-op cb44bcb link true /test e2e-gcp-op
ci/prow/e2e-aws-ovn cb44bcb link true /test e2e-aws-ovn
ci/prow/e2e-gcp-op-techpreview cb44bcb link false /test e2e-gcp-op-techpreview
ci/prow/e2e-hypershift cb44bcb link true /test e2e-hypershift

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.

The kubelet skew guard is from 1471d2c (Bug 1986453: Check for API
server and node versions skew, 2021-07-27, openshift#2658).  But the Kube API
server also landed a similar guard in
openshift/cluster-kube-apiserver-operator@9ce4f74775 (add
KubeletVersionSkewController, 2021-08-26,
openshift/cluster-kube-apiserver-operator#1199).
openshift/enhancements@0ba744e750 (eus-upgrades-mvp: don't enforce
skew check in MCO, 2021-04-29, openshift/enhancements#762) had shifted
the proposal from MCO-guards to KAS-guards, so I'm not clear on why
the MCO guard landed.  This commit drops it, to consolidate around the
KAS-side guard.
@wking wking force-pushed the drop-kubelet-skew-guard branch from cb44bcb to 2c9e7d6 Compare April 4, 2025 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants