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.

Sign up for GitHub

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

Jump to bottom

Re-add service catalog apiserver removal job #82

Merged
merged 2 commits into from Apr 7, 2020
Merged

Re-add service catalog apiserver removal job #82

merged 2 commits into from Apr 7, 2020

Conversation

jmrodri
Copy link
Contributor

@jmrodri jmrodri commented Apr 1, 2020

Revert "Revert "Re-add service catalog apiserver removal job""

This reverts commit 30c4a4d.

Original PR attempts:
#80
#74

@jmrodri
Re-add service catalog apiserver removal job
6867087 
Revert "Revert "Re-add service catalog apiserver removal job""

This reverts commit 30c4a4d.

Original PR attempts:
openshift#80
openshift#74
@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 1, 2020

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2020
@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 2, 2020

/retest

@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 7, 2020

Without the create-only annotation, upgrading from this PR to PR #83 (which also didn't have create-only). The upgrade failed with the error:

fail [github.com/openshift/origin/test/e2e/upgrade/upgrade.go:135]: during upgrade to registry.svc.ci.openshift.org/ci-ln-kigfxi2/release@sha256:753a1f1c11ee941ca2f4614a68044aab7e9575329e3cf6742c9653c7c6d47ac9 Unexpected error: <*errors.errorString | 0xc0015e4100>: { s: "Cluster did not complete upgrade: timed out waiting for the condition: Could not update job \"openshift-service-catalog-removed/openshift-service-catalog-apiserver-remover\" (498 of 574): the object is invalid, possibly due to local cluster configuration", } Cluster did not complete upgrade: timed out waiting for the condition: Could not update job "openshift-service-catalog-removed/openshift-service-catalog-apiserver-remover" (498 of 574): the object is invalid, possibly due to local cluster configuration occurred

https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade/24817

@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 7, 2020

When both PRs have create-only the upgrade from this PR to PR #83 works fine.
https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-upgrade/24805

@jmrodri jmrodri mentioned this pull request Apr 7, 2020
Merged
@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 7, 2020

/test verify

@jmrodri jmrodri requested review from wking and jottofar April 7, 2020 13:46
@jmrodri
Copy link
Contributor Author

jmrodri commented Apr 7, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 7, 2020
@joelanford
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2020
@openshift-merge-robot openshift-merge-robot merged commit a6837f7 into openshift:master Apr 7, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmrodri, joelanford

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

@jmrodri jmrodri mentioned this pull request Apr 7, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford Awaiting requested review from joelanford

@shawn-hurley shawn-hurley Awaiting requested review from shawn-hurley

@wking wking Awaiting requested review from wking

@jottofar jottofar Awaiting requested review from jottofar

Assignees

@joelanford joelanford

Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jmrodri @joelanford @openshift-ci-robot @openshift-merge-robot