OCPBUGS-113639: move empty CRIOCredentialProviderConfig CR to run-level 0000_10 - #3010
OCPBUGS-113639: move empty CRIOCredentialProviderConfig CR to run-level 0000_10#3010sdodson wants to merge 1 commit into
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
|
@sdodson: This pull request references Jira Issue OCPBUGS-113639, 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. |
|
Hello @sdodson! Some important instructions when contributing to openshift/api: |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
…el 0000_10 Backport of OCPBUGS-99266. The empty CRIOCredentialProviderConfig CR shipped at run-level 0000_05 (0000_05_config-operator_02_criocredentialproviderconfig.cr.yaml, gated on the CRIOCredentialProviderConfig feature gate) while its CRD is generated at run-level 0000_10. When the feature gate is enabled mid-update (e.g. setting TechPreviewNoUpgrade), the update-mode CVO cannot complete run-level 0000_05 because the CR's CRD does not yet exist, and that run-level 0000_05 failure blocks it from ever reaching run-level 0000_10 to create the CRD, deadlocking the update. Move the empty CR to run-level 0000_10 (operatorOrdering 02) so it sorts (and applies) after the CRD at 0000_10_config-operator_01 within the same run-level and component. This matches the existing precedent for the non-bootstrap Node config resource (0000_10_config-operator_02_node.cr.yaml). Master was fixed differently (openshift#2844, promote feature gate to Default + delete manual overrides); that is a feature promotion unsuitable for a z-stream, so this backport applies the minimal run-level reorder only. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> rh-pre-commit.version: 2.4.0 rh-pre-commit.check-secrets: ENABLED
216dfc7 to
eb17e6c
Compare
|
Scheduling tests matching the |
|
/label backport-risk-assessed |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: everettraven The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: everettraven The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@sdodson: The following tests failed, say
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. |
|
/hold |
Backport of OCPBUGS-99266 to release-4.22.
Problem
The empty
CRIOCredentialProviderConfigCR shipped at run-level0000_05(
0000_05_config-operator_02_criocredentialproviderconfig.cr.yaml, gated on theCRIOCredentialProviderConfigfeature gate), while its CRD is generated atrun-level
0000_10(
0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml).When the feature gate is enabled mid-update (e.g. setting
TechPreviewNoUpgrade),the update-mode CVO cannot complete run-level
0000_05because the CR's CRD doesnot yet exist, and that failure blocks it from ever reaching run-level
0000_10to create the CRD — deadlocking the update with
UpdatePayloadResourceTypeMissing: ... the server does not recognize this resource.Fix
Move the empty CR to run-level
0000_10(operatorOrdering02) so it sorts andapplies after the CRD at
0000_10_config-operator_01within the samerun-level and component. This is a pure rename of the static empty-resource
manifest — no code generation, no schema change.
This matches the existing precedent for the other non-bootstrap config resource,
0000_10_config-operator_02_node.cr.yaml, whose CRD (nodes) is likewisegenerated at run-level
0000_10.Why not the master fix
Master was fixed by #2844 (promote the feature gate to
Default+ delete themanual-override manifests). That is a feature promotion and not appropriate to
backport to a released z-stream, so this PR applies the minimal, low-risk
run-level reorder instead.
Verification
LC_ALL=Csort of the pair now yields the CRD (_01) before the CR (_02):