Skip to content

Add manifest annotations for hosted deployment exclusions#1266

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
csrwng:hosted_exclusions
Nov 21, 2019
Merged

Add manifest annotations for hosted deployment exclusions#1266
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
csrwng:hosted_exclusions

Conversation

@csrwng
Copy link
Copy Markdown
Contributor

@csrwng csrwng commented Nov 13, 2019

Enables the CVO to exclude manifests in an externally hosted control plane deployment
See openshift/cluster-version-operator#252

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 13, 2019
@kikisdeliveryservice kikisdeliveryservice removed the request for review from LorbusChris November 13, 2019 20:01
@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 15, 2019

/assign @LorbusChris
This should be ready for merge

@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 15, 2019

/retest

cgwalters
cgwalters reviewed Nov 15, 2019
View reviewed changes
Comment thread install/0000_90_machine-config-operator_01_prometheus-rules.yaml Outdated
Copy link
Copy Markdown
Member

@cgwalters cgwalters Nov 15, 2019

Choose a reason for hiding this comment

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

I think we want these Prometheus rules even in external control plane scenarios, right?

Copy link
Copy Markdown
Contributor Author

@csrwng csrwng Nov 15, 2019

Choose a reason for hiding this comment

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

ack, will remove this change

cgwalters
cgwalters requested changes Nov 15, 2019
View reviewed changes
Comment thread install/0001_00_machine-config-operator_00_service.yaml Outdated
Copy link
Copy Markdown
Member

@cgwalters cgwalters Nov 15, 2019

Choose a reason for hiding this comment

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

And similar for this.

Copy link
Copy Markdown
Contributor Author

@csrwng csrwng Nov 15, 2019

Choose a reason for hiding this comment

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

@cgwalters do you mean that the mcd itself should be available?

Copy link
Copy Markdown
Member

@cgwalters cgwalters Nov 15, 2019

Choose a reason for hiding this comment

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

Right, the MCD isn't control plane. so we don't want to exclude anything related to it.

Copy link
Copy Markdown
Contributor Author

@csrwng csrwng Nov 18, 2019

Choose a reason for hiding this comment

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

Thanks, updated

@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 19, 2019

@LorbusChris @cgwalters this should be ready.

@sinnykumari
Copy link
Copy Markdown
Contributor

sinnykumari commented Nov 19, 2019

/hold
since freeze unless there's a BZ

@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 Nov 19, 2019
@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 19, 2019

@sinnykumari we have exception approval to get this change in to 4.3 per @derekwaynecarr

@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Nov 19, 2019

OK, I trust you to know whether or not a BZ is required.
/approve

@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 19, 2019
@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Nov 19, 2019

(Did other PRs like this need a BZ or not?)
/lgtm

Will let @sinnykumari lift the hold if she agrees.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Nov 19, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 19, 2019

(Did other PRs like this need a BZ or not?)

They did not, since it's not a bug, it's a post-feature freeze exception. You can see the PRs linked to openshift/cluster-version-operator#252

@csrwng
Copy link
Copy Markdown
Contributor Author

csrwng commented Nov 19, 2019

@derekwaynecarr can you please ack that this is ok to merge?

@sinnykumari
Copy link
Copy Markdown
Contributor

sinnykumari commented Nov 19, 2019

/hold cancel

Sorry, didn't know about the explicit approval!

@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 Nov 19, 2019
@sinnykumari
Copy link
Copy Markdown
Contributor

sinnykumari commented Nov 19, 2019

/test e2e-gcp-op

@runcom
Copy link
Copy Markdown
Member

runcom commented Nov 19, 2019 •
edited
Loading

/hold cancel

keeping the hold till @derekwaynecarr comes back since we're past freeze and this doesn't have an attached BZ

@runcom
Copy link
Copy Markdown
Member

runcom commented Nov 19, 2019

/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 Nov 19, 2019
@runcom
Copy link
Copy Markdown
Member

runcom commented Nov 19, 2019

/retest

@derekwaynecarr
Copy link
Copy Markdown
Member

derekwaynecarr commented Nov 21, 2019

/hold cancel

This should merge. Thanks!

@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 Nov 21, 2019
@openshift-merge-robot openshift-merge-robot merged commit ea51a9f into openshift:master Nov 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cgwalters cgwalters cgwalters requested changes

@ericavonb ericavonb Awaiting requested review from ericavonb

Assignees

@cgwalters cgwalters

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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@csrwng @sinnykumari @cgwalters @openshift-ci-robot @runcom @derekwaynecarr @LorbusChris @openshift-merge-robot