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

IBM Cloud manifest profile patch for operator deployment #252

Merged

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Jul 19, 2021

Bumps build-machinery-go to latest
Adds patch specific to ibm-cloud-managed profile that generates a manifest that removes node selector for operator deployment
make verify verifies that the generated manifest is up to date
make update updates the manifest by applying the ibm-cloud-managed patch to the original deployment manifest

@openshift-ci openshift-ci bot requested review from dagrayvid and jmencak July 19, 2021 20:14
@jmencak
Copy link
Contributor

jmencak commented Jul 20, 2021

Thank you for the PR, @ csrwng . Could you please explain why we need a separate 50-operator-ibm-cloud-managed.yaml file and the patching mechanism instead of having a include.release.openshift.io/ibm-cloud-managed: "true" annotation to the existing operator manifest?

@jmencak
Copy link
Contributor

jmencak commented Jul 20, 2021

@csrwng , I think I see the point now, so you cannot use

      nodeSelector:
        node-role.kubernetes.io/master: ""

on IBM Cloud for some reason. How do we make sure 50-operator.yaml and 50-operator-ibm-cloud-managed.yaml are both not rendered on non-IBM Cloud clusters though?

@csrwng
Copy link
Contributor Author

csrwng commented Jul 20, 2021

Hi @jmencak this is part of the cluster profiles support in the CVO (openshift/cluster-version-operator#404). At any one time, there is only one cluster profile in effect when the CVO applies manifests to the cluster. The default profile is the self-managed-high-availability profile. If a manifest does not include the include.release.openshift.io/self-managed-high-availability: "true" annotation, it does not get applied. That means that the new manifest 50-operator-ibm-cloud-managed.yaml will not get applied in a standard self-hosted OCP.

@jmencak
Copy link
Contributor

jmencak commented Jul 20, 2021

Thank you for the explanation, Cesar.
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 20, 2021
Copy link
Contributor

@jmencak jmencak left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

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

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

/retest-required

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit dca1768 into openshift:master Jul 20, 2021
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. 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

4 participants