[release-4.9] Bug 2011701: do not modify cvo ignores for bootstrap-in-place #5277
Conversation
When doing a bootstrap-in-place installation, the cluster-version-operator does not start until after the bootstrap machine has pivoted to being a control-plane machine. Consequently, there is no possibility of the cluster-bootstrap racing with the cluster-version-operator to create resources. The code that was added to fix Bug 2008119 [1] is not necessary for bootstrap-in-place installations. In fact, the code actually breaks bootstrap-in-place installations by trying to restore the CVO overrides after cluster-bootstrap finishes but before the bootstrap-to-control-plane pivot occurs. The changes in this commit restrict the code for Bug 2008119 to only installations that are not bootstrap-in-place. [1] openshift#5258
After cluster-bootstrap completes, the bootkube script attempts to restore the original CVO overrides. It is possible that the API will not be available yet (or be down temporarily). Instead of restarting the bootkube script in this case, let's just retry the patch.
|
@openshift-cherrypick-robot: Detected clone of Bugzilla bug 2010665 with correct target release. Retitling PR to link to clone: 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 kubernetes/test-infra repository. |
openshift-ci
bot
changed the title
|
@openshift-cherrypick-robot: This pull request references Bugzilla bug 2011652, which is invalid:
Comment 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 kubernetes/test-infra repository. |
openshift-ci
bot
added
bugzilla/severity-urgent
|
/retitle [release-4.9] Bug 2011701: do not modify cvo ignores for bootstrap-in-place |
openshift-ci
bot
changed the title
openshift-ci
bot
added
bugzilla/valid-bug
|
@openshift-cherrypick-robot: This pull request references Bugzilla bug 2011701, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. 6 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (ohochman@redhat.com), skipping review request. 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 kubernetes/test-infra repository. |
|
@openshift-cherrypick-robot: The following tests failed, say
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/test-infra repository. I understand the commands that are listed here. |
|
/retest-required |
|
cc: @staebler |
|
Second bootstrap-in-place job was successful, too. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: staebler 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 |
openshift-ci
bot
added
the
approved
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
3 similar comments
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
| oc patch clusterversion.config.openshift.io version \ | ||
| --kubeconfig=/opt/openshift/auth/kubeconfig \ | ||
| --type=merge \ | ||
| --patch-file=/opt/openshift/original_cvo_overrides.patch |
There was a problem hiding this comment.
why is this step never necessary(and never will be necessary?) for a BIP flow?
There was a problem hiding this comment.
The CVOIgnore asset is only used for the normal bootstrap ignition and not the bootstrap-in-place ignition [1]. That asset is responsible for replacing the ClusterVersion manifest created by the Common Manifests asset [2] with one that adds all of the resources created by installer manifests to the .spec.overrides field.
The line in question here restores the spec.overrides field to whatever the user specified (or the default empty if the user made no changes). If the install is a bootstrap-in-place, then the installer did not modify the .spec.overrides field and so the bootstrap does not need to restore the field.
installer/pkg/asset/manifests/operators.go
Line 151 in 8c98d85
sdodson
added
the
staff-eng-approved
|
@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: Bugzilla bug 2011701 has been moved to the MODIFIED state. 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 kubernetes/test-infra repository. |
This is an automated cherry-pick of #5271
/assign eranco74