WIP: OCPBUGS-80958: NodeUID in status to detect replaced node with same name#2821
WIP: OCPBUGS-80958: NodeUID in status to detect replaced node with same name#2821bhperry wants to merge 2 commits into
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
openshift-ci-robot
added
the
jira/valid-reference
|
@bhperry: This pull request references Jira Issue OCPBUGS-80958, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn 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-robot
added
the
jira/invalid-bug
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughThe change adds an optional 🚥 Pre-merge checks | ✅ 14 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (14 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
Hello @bhperry! Some important instructions when contributing to openshift/api: |
openshift-ci
Bot
added
the
size/L
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@bhperry: This pull request references Jira Issue OCPBUGS-80958, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
DetailsIn 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. |
|
/retest |
|
@bhperry: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
bhperry
force-pushed
the
kube-apiserver-node-replace
branch
from
85d77b4 to
07f1fbe
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
operator/v1/types.go (1)
262-264:⚠️ Potential issue | 🟠 MajorValidators on
currentRevisionblock the reset behavior documented fornodeUIDchangesLines 262 and 278 enforce that
currentRevisioncannot be unset once set and must only increase. However, thenodeUIDfield added in lines 270–274 explicitly documents that status should reset when the UID changes (indicating node replacement). These validators prevent that reset, blocking the intended functionality.The validators must be conditioned to allow reset when
nodeUIDchanges:Suggested fix
Modify line 262 to allow unsetting when nodeUID changes:
-// +kubebuilder:validation:XValidation:rule="has(self.currentRevision) || !has(oldSelf.currentRevision)",message="cannot be unset once set",fieldPath=".currentRevision" +// +kubebuilder:validation:XValidation:rule="has(self.currentRevision) || !has(oldSelf.currentRevision) || (has(self.nodeUID) && has(oldSelf.nodeUID) && self.nodeUID != oldSelf.nodeUID)",message="cannot be unset once set unless nodeUID changes",fieldPath=".currentRevision"Modify line 278 to allow decrease when nodeUID changes:
-// +kubebuilder:validation:XValidation:rule="self >= oldSelf",message="must only increase" +// +kubebuilder:validation:XValidation:rule="!has(self.currentRevision) || !has(oldSelf.currentRevision) || self.currentRevision >= oldSelf.currentRevision || (has(self.nodeUID) && has(oldSelf.nodeUID) && self.nodeUID != oldSelf.nodeUID)",message="must only increase unless nodeUID changes",optionalOldSelf=true,fieldPath=".currentRevision"Also applies to: lines 270–275, 278–280
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@operator/v1/types.go` around lines 262 - 264, The XValidation rules on the status fields currentRevision and targetRevision currently forbid unsetting/decreasing but must allow that when the node was replaced (nodeUID changed); update the XValidation expressions on the currentRevision and targetRevision tags to include an OR that permits the change if self.nodeUID != oldSelf.nodeUID (or if oldSelf.nodeUID is missing) so the rule reads roughly "has(self.currentRevision) || !has(oldSelf.currentRevision) || self.nodeUID != oldSelf.nodeUID" (and similarly allow decrease for targetRevision by adding "|| self.nodeUID != oldSelf.nodeUID"); ensure optionalOldSelf=true is present where needed and adjust the two validation annotations referencing currentRevision/targetRevision to include this nodeUID-change exception.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml`:
- Around line 264-269: Summary: The schema claims status should reset when
nodeUID changes, but nodeStatuses is keyed only by nodeName and
revision/validation rules enforce monotonic behavior, blocking resets on node
replacement; update the CRD so UID changes can represent a fresh status. Fix:
modify the manifest so either (A) nodeStatuses map key includes nodeUID (e.g.,
composite key or change to a map keyed by "nodeName+nodeUID") or (B) keep
nodeName key but add nodeUID as a required field inside each nodeStatuses value
and change the revision/validation rules (the fields enforcing
monotonic/non-unset revisions such as the condition revision constraints) to
only apply when the stored nodeUID equals the incoming nodeUID; ensure the
condition revision validations reference nodeUID equality (not just nodeName) or
are scoped to the value object so a UID change bypasses monotonic checks.
Reference symbols: nodeUID, nodeStatuses, and the condition/revision validation
rules that enforce monotonic/non-unset behavior.
---
Outside diff comments:
In `@operator/v1/types.go`:
- Around line 262-264: The XValidation rules on the status fields
currentRevision and targetRevision currently forbid unsetting/decreasing but
must allow that when the node was replaced (nodeUID changed); update the
XValidation expressions on the currentRevision and targetRevision tags to
include an OR that permits the change if self.nodeUID != oldSelf.nodeUID (or if
oldSelf.nodeUID is missing) so the rule reads roughly "has(self.currentRevision)
|| !has(oldSelf.currentRevision) || self.nodeUID != oldSelf.nodeUID" (and
similarly allow decrease for targetRevision by adding "|| self.nodeUID !=
oldSelf.nodeUID"); ensure optionalOldSelf=true is present where needed and
adjust the two validation annotations referencing currentRevision/targetRevision
to include this nodeUID-change exception.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: d56018d4-5aa4-4450-9d29-87334e0bb187
⛔ Files ignored due to path filters (17)
openapi/generated_openapi/zz_generated.openapi.gois excluded by!openapi/**,!**/zz_generated*openapi/openapi.jsonis excluded by!openapi/**operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-OKD.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/EventTTL.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.swagger_doc_generated.gois excluded by!**/zz_generated*
📒 Files selected for processing (9)
operator/v1/types.gopayload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-OKD.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers.crd.yamlpayload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yamlpayload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml
bhperry
force-pushed
the
kube-apiserver-node-replace
branch
from
07f1fbe to
a05c5cc
Compare
|
/testwith openshift/api/main/images openshift/library-go#2178 openshift/client-go#371 |
|
@bhperry, |
|
/testwith openshift/api/master/images openshift/library-go#2178 openshift/client-go#371 |
|
@bhperry, |
|
/testwith ? |
|
/test ? |
|
@dusk125: The following commands are available to trigger required jobs: The following commands are available to trigger optional jobs: Use DetailsIn 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 kubernetes-sigs/prow repository. |
bhperry
force-pushed
the
kube-apiserver-node-replace
branch
2 times, most recently
from
e78b95e to
6f32214
Compare
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yaml (1)
361-387: 🗄️ Data Integrity & Integration | 🟠 Major | 🏗️ Heavy liftNode replacement reset is still blocked by the existing
currentRevisionvalidation.Adding
nodeUIDhere documents that a same-name replacement node should reset its status, butnodeStatusesis still keyed bynodeName, and Lines 377-383 still reject clearingcurrentRevisionon update. That leaves stale revision state attached to the replacement node instead of allowing a clean reset. Please update the upstreamNodeStatusXValidation rules for thenodeUIDtransition and regenerate the CRDs/tests together. Based on the upstreamNodeStatuscontract inoperator/v1/types.go:261-280and the existing fixture inoperator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml:15-90, this reset path is already enforced downstream.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yaml` around lines 361 - 387, The `NodeStatus` validation still blocks a same-name replacement node from resetting stale revision state because the existing `currentRevision` XValidation on `NodeStatus` prevents clearing it on update. Update the upstream `NodeStatus` contract and its XValidation rules to allow the `nodeUID`-based replacement transition to reset status cleanly, while preserving the intended create-time restrictions on `currentRevision` and `targetRevision`. Regenerate the CRD and keep the downstream fixture/tests in sync, using `NodeStatus`, `nodeUID`, and the existing `currentRevision`/`targetRevision` validation rules as the places to update.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In
`@payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yaml`:
- Around line 361-387: The `NodeStatus` validation still blocks a same-name
replacement node from resetting stale revision state because the existing
`currentRevision` XValidation on `NodeStatus` prevents clearing it on update.
Update the upstream `NodeStatus` contract and its XValidation rules to allow the
`nodeUID`-based replacement transition to reset status cleanly, while preserving
the intended create-time restrictions on `currentRevision` and `targetRevision`.
Regenerate the CRD and keep the downstream fixture/tests in sync, using
`NodeStatus`, `nodeUID`, and the existing `currentRevision`/`targetRevision`
validation rules as the places to update.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: d6cb578a-f955-43c5-8027-234157e692e7
⛔ Files ignored due to path filters (22)
openapi/generated_openapi/zz_generated.openapi.gois excluded by!openapi/**,!**/zz_generated*openapi/openapi.jsonis excluded by!openapi/**operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-OKD.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-Default.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-DevPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-OKD.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers-TechPreviewNoUpgrade.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yamlis excluded by!**/zz_generated.crd-manifests/*operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/EventTTL.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/KMSEncryption.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yamlis excluded by!**/zz_generated.featuregated-crd-manifests/**operator/v1/zz_generated.swagger_doc_generated.gois excluded by!**/zz_generated*
📒 Files selected for processing (13)
operator/v1/types.gopayload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-OKD.crd.yamlpayload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-CustomNoUpgrade.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-Default.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-DevPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-OKD.crd.yamlpayload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-TechPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yamlpayload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml
✅ Files skipped from review due to trivial changes (1)
- payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml
🚧 Files skipped from review as they are similar to previous changes (8)
- payload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml
- payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml
- payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers-OKD.crd.yaml
- payload-manifests/crds/0000_12_etcd_01_etcds-OKD.crd.yaml
- payload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yaml
- payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml
- payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml
- operator/v1/types.go
bhperry
force-pushed
the
kube-apiserver-node-replace
branch
from
6f32214 to
e3673e7
Compare
3 participants
No description provided.