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

Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator #534

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #531

/assign wking

This is a hack fix for [1], where we have a delay on 4.6->4.7 updates,
and on some 4.7 installs, between the very early ClusterOperator
precreation and the operator eventually coming up to set its status
conditions.  In the interim, there are no conditions, which causes
cluster_operator_up to be 0, which causes the critical
ClusterOperatorDown to fire.  We'll want a more general fix going
forward, this commit is a temporary hack to avoid firing the critical
ClusterOperatorDown while we build consensus around the general fix.

The downside to dropping precreates for this operator is that we lose
the must-gather references when the operator fails to come up.  That
was what precreation was designed to address in 2a469e3 (cvo: When
installing or upgrading, fast-fill cluster-operators, 2020-02-07, openshift#318).
If we actually get a must-gather without the bare-metal bits and we
miss them, we can revisit the approach this hack is taking.

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1929917
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Bugzilla bug 1929917 has been cloned as Bugzilla bug 1941217. Retitling PR to link against new bug.
/retitle [release-4.7] Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

In response to this:

[release-4.7] Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

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 changed the title [release-4.7] Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator [release-4.7] Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator Mar 20, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Mar 20, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1941217, 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
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1929917 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1929917 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (yanyang@redhat.com), skipping review request.

In response to this:

[release-4.7] Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 20, 2021
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

/lgtm
/rename Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, wking

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 openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2021
@wking
Copy link
Member

wking commented Mar 20, 2021

/retitle Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

@openshift-ci-robot openshift-ci-robot changed the title [release-4.7] Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator Mar 20, 2021
@openshift-ci-robot openshift-ci-robot removed the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 20, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1929917, which is invalid:

  • expected the bug to target the "4.7.z" release, but it targets "4.8.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is VERIFIED instead
  • expected Bugzilla bug 1929917 to depend on a bug targeting a release in 4.8.0 and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

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

In response to this:

Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

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 bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 20, 2021
@wking
Copy link
Member

wking commented Mar 20, 2021

/retitle Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

@openshift-ci-robot openshift-ci-robot changed the title Bug 1929917: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator Mar 20, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 20, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1941217, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1929917 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1929917 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (yanyang@redhat.com), skipping review request.

In response to this:

Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 20, 2021
@wking
Copy link
Member

wking commented Mar 20, 2021

/override ci/prow/e2e-metal-assisted

Test is broken, and should not be run or required (bug in openshift/release's 4.7 forking).

@openshift-ci-robot
Copy link
Contributor

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-metal-assisted

In response to this:

/override ci/prow/e2e-metal-assisted

Test is broken, and should not be run or required (bug in openshift/release's 4.7 forking).

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.

@jwforres jwforres added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 24, 2021
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@wking
Copy link
Member

wking commented Mar 25, 2021

/override ci/prow/e2e-metal-assisted

Should not be required

@openshift-ci-robot
Copy link
Contributor

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-metal-assisted

In response to this:

/override ci/prow/e2e-metal-assisted

Should not be required

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

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 7df967b into openshift:release-4.7 Mar 26, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1941217 has been moved to the MODIFIED state.

In response to this:

Bug 1941217: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator

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.

@wking
Copy link
Member

wking commented Mar 28, 2021

/cherrypick release-4.6

@openshift-cherrypick-robot
Copy link
Author

@wking: #534 failed to apply on top of branch "release-4.6":

Applying: pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator
Using index info to reconstruct a base tree...
M	pkg/cvo/sync_worker.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cvo/sync_worker.go
CONFLICT (content): Merge conflict in pkg/cvo/sync_worker.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/cvo/sync_worker: Skip precreation of baremetal ClusterOperator
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.6

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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

6 participants