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

[release-4.11] OCPBUGS-4530: Enable CVO unmanage overrides in bootstrap-in-place installations #6668

Conversation

omertuc
Copy link
Contributor

@omertuc omertuc commented Dec 6, 2022

This is a manual cherry-pick of #6664

…tallations

# Background

openshift#5258 introduced a mechanism to tell CVO to not manage some cluster resources,
as that management was creating races between bootkube and CVO.

In openshift#5271, this mechanism was removed from bootstrap-in-place
installations.

The reason for the removal was because attempting to apply
`original_cvo_overrides.patch` after the cluster-bootstrap podman
container was done wasn't working, as in BIP by the time that that
container is down, there's no longer a running kube-apiserver apply the
patch on (unlike regular installations with a bootstrap node where the
API server keeps running on the actual nodes). The justification for
simply disabling the mechanism instead of finding a solution was based
on an incorrect assumption that "CVO doesn't even run in BIP pre-pivot
so there's no need to perform overrides anyway as there's no CVO to race
with".

# Issue

Naturally, since CVO *is* actually running in the pre-pivot phase of
bootstrap-in-place, not applying CVO overrides to disable the CVO
management of bootkube-created resources led to the same races openshift#5258 was
aiming to solve in bootstrap-in-place installations.

One manifestation of that is OCPBUGS-4125.

# Solution

This commit re-introduces the mechanism that was originally introduced in openshift#5258
(and removed in openshift#5271).

To solve the issue that motivated openshift#5271, this commit doesn't attempt to
apply the `original_cvo_overrides.patch` in bootstrap-in-place
pre-reboot, and instead will transfer `original_cvo_overrides.patch` through
`master-update.fcc` to the post-pivot phase and the bootstrap-in-place
post-reboot script will make sure to apply the patch after the API
server is running again.
@openshift-ci-robot
Copy link
Contributor

@omertuc: Jira Issue OCPBUGS-4506 has been cloned as Jira Issue OCPBUGS-4530. Retitling PR to link against new bug.
/retitle [release-4.11] OCPBUGS-4530: Enable CVO unmanage overrides in bootstrap-in-place installations

In response to this:

This is an automated cherry-pick of #6664

/assign omertuc

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 openshift-ci bot changed the title [release-4.11] OCPBUGS-4506: Enable CVO unmanage overrides in bootstrap-in-place installations [release-4.11] OCPBUGS-4530: Enable CVO unmanage overrides in bootstrap-in-place installations Dec 6, 2022
@openshift-ci-robot openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Dec 6, 2022
@openshift-ci-robot
Copy link
Contributor

@omertuc: This pull request references Jira Issue OCPBUGS-4530, which is invalid:

  • expected dependent Jira Issue OCPBUGS-4506 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

This is an automated cherry-pick of #6664

/assign omertuc

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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 6, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 6, 2022

@omertuc: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.11] OCPBUGS-4530: Enable CVO unmanage overrides in bootstrap-in-place installations

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.

1 similar comment
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 6, 2022

@omertuc: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.11] OCPBUGS-4530: Enable CVO unmanage overrides in bootstrap-in-place installations

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-robot
Copy link
Contributor

@omertuc: This pull request references Jira Issue OCPBUGS-4530, which is invalid:

  • expected dependent Jira Issue OCPBUGS-4506 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

This is a manual cherry-pick of #6664

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.

@patrickdillon
Copy link
Contributor

/jira-refresh
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 6, 2022
@patrickdillon
Copy link
Contributor

/jira refresh
/lgtm

@openshift-ci-robot
Copy link
Contributor

@patrickdillon: This pull request references Jira Issue OCPBUGS-4530, which is invalid:

  • expected dependent Jira Issue OCPBUGS-4506 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh
/lgtm

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 openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Dec 6, 2022
@patrickdillon
Copy link
Contributor

/skip
/retest-required

@gpei
Copy link
Contributor

gpei commented Dec 7, 2022

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 7, 2022
@wking
Copy link
Member

wking commented Dec 7, 2022

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@wking: This pull request references Jira Issue OCPBUGS-4530, which is invalid:

  • expected dependent Jira Issue OCPBUGS-4506 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@chadcrum
Copy link

chadcrum commented Dec 9, 2022

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 9, 2022
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-4506 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-4506 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @chadcrum

In response to this:

/jira refresh

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.

Copy link

@chadcrum chadcrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chadcrum, patrickdillon

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7e60d78 and 2 for PR HEAD 358c722 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2022

@omertuc: 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-vsphere 358c722 link false /test e2e-vsphere
ci/prow/e2e-gcp 358c722 link false /test e2e-gcp
ci/prow/e2e-libvirt 358c722 link false /test e2e-libvirt
ci/prow/e2e-openstack 358c722 link false /test e2e-openstack
ci/prow/e2e-aws-upi-proxy 358c722 link false /test e2e-aws-upi-proxy
ci/prow/e2e-ibmcloud 358c722 link false /test e2e-ibmcloud
ci/prow/e2e-crc 358c722 link false /test e2e-crc

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.

@omertuc
Copy link
Contributor Author

omertuc commented Dec 9, 2022

/test e2e-aws

@openshift-merge-robot openshift-merge-robot merged commit 4bf477b into openshift:release-4.11 Dec 9, 2022
@openshift-ci-robot
Copy link
Contributor

@omertuc: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-4530 has been moved to the MODIFIED state.

In response to this:

This is a manual cherry-pick of #6664

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.

@omertuc
Copy link
Contributor Author

omertuc commented Jan 31, 2023

/cherry-pick release-4.10

@openshift-cherrypick-robot

@omertuc: new pull request created: #6819

In response to this:

/cherry-pick release-4.10

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants