Skip to content

Add IBM Cloud managed annotations to CVO manifests #2221

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
Merged
openshift-merge-robot merged 1 commit into from
Dec 6, 2020
Merged

Add IBM Cloud managed annotations to CVO manifests #2221

openshift-merge-robot merged 1 commit into from
Dec 6, 2020

Conversation

@csrwng
Copy link
Contributor

@csrwng csrwng commented Nov 12, 2020

This matches openshift/enhancements#445 and does
not change behavior.

@ashcrow ashcrow requested review from darkmuggle and runcom November 12, 2020 18:49
@cgwalters
Copy link
Member

cgwalters commented Nov 13, 2020 •
edited
Loading

https://github.com/csrwng/enhancements/blob/2f2b304ef796adc13726917846ec0a9698a9f1c0/enhancements/update/ibm-public-cloud-support.md
says:

The CVO needs to skip manifests that instantiate control plane operators, machine API related operators, and others that do not apply to this topology. These include:
...
machine-config-operator

Yet this annotation seems like it's saying to include the MCO? Or are we now working on a next phase that adds the MCO? (If so that'd be great! Looking forward to that model working particularly with RHCOS)

@csrwng
Copy link
Contributor Author

csrwng commented Nov 14, 2020

@cgwalters we're currently not excluding all MCO manifests. The purpose of this PR is to keep parity with what we currently have with the exclude annotation (as in

machine-config-operator/install/0000_80_machine-config-operator_04_deployment.yaml

Line 9 in aa54de3

exclude.release.openshift.io/internal-openshift-hosted: "true"
). None of the manifests that currently have the exclude annotation are getting the new include annotation, if that makes sense.

@csrwng
Copy link
Contributor Author

csrwng commented Nov 20, 2020

/retest

@cgwalters
Copy link
Member

cgwalters commented Nov 20, 2020

None of the manifests that currently have the exclude annotation are getting the new include annotation, if that makes sense.

Kind of 😄
Willing to trust you here, I honestly have trouble wrapping my head around this totally different way to run OpenShift. Are there any e2es or periodics that cover this? Is there an easy/documented way to test behavior with this?

/approve
on general principle based on the above. Will leave a lgtm to someone else.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 20, 2020
@cgwalters
Copy link
Member

cgwalters commented Dec 2, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2020
@cgwalters cgwalters mentioned this pull request Dec 2, 2020
Merged
@runcom
Copy link
Member

runcom commented Dec 3, 2020

/retest

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Dec 4, 2020

This will need a rebase.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

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

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2020
@csrwng
Copy link
Contributor Author

csrwng commented Dec 4, 2020

Thanks @kikisdeliveryservice, rebased

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Dec 5, 2020

This was fully approved on time but needed a rebase due to another PR merging. Readding lgtm.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 5, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, csrwng, kikisdeliveryservice

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [cgwalters,kikisdeliveryservice]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Dec 5, 2020

/skip

@kikisdeliveryservice
Copy link
Contributor

kikisdeliveryservice commented Dec 5, 2020

/retest

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 6, 2020

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 6, 2020

/retest

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

@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Dec 6, 2020 •
edited
Loading

@csrwng: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/okd-e2e-aws efbb799 link /test okd-e2e-aws
ci/prow/e2e-ovn-step-registry efbb799 link /test e2e-ovn-step-registry
ci/prow/e2e-aws-workers-rhel7 efbb799 link /test e2e-aws-workers-rhel7

Full PR test history. Your PR dashboard.

Details

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.

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 6, 2020

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 6, 2020

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 34d1cf0 into openshift:master Dec 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashcrow ashcrow Awaiting requested review from ashcrow

@cgwalters cgwalters Awaiting requested review from cgwalters

@runcom runcom Awaiting requested review from runcom

@darkmuggle darkmuggle Awaiting requested review from darkmuggle

Assignees

@cgwalters cgwalters

@kikisdeliveryservice kikisdeliveryservice

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.

7 participants

@csrwng @cgwalters @runcom @kikisdeliveryservice @openshift-bot @openshift-ci-robot @openshift-merge-robot