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

Support external control plane topology #187

Merged
merged 2 commits into from Jul 21, 2021

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Jul 19, 2021

If running on a cluster with control plane topology of type 'External' (as in ROKS or Hypershift), CSI operators should not be scheduled to masters. This change sets the node selector to empty if this is the case.

@@ -41,6 +41,8 @@ type CSIOperatorConfig struct {
OLMOptions *OLMOptions
// Run the CSI driver operator only when given FeatureGate is enabled
RequireFeatureGate string
// Schedule CSI driver operator on workers when control plane is externalized
ScheduleOnWorkers bool
Copy link
Member

Choose a reason for hiding this comment

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

@csrwng on vSphere clusters we also schedule the vsphere-problem-detector pod on master nodes, is that something we need to change as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, thank you, we should. Will update this PR

@jsafrane
Copy link
Contributor

Is there a generic document describing what runs where when using various deployment tools like installer (with masters), hypershift (without masters) etc? These PRs are nice, however, there are many things that need to be changed in all storage operators.

@bertinatto
Copy link
Member

/retest

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

/lgtm
The flake seems unrelated to this PR.

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

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

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

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 21, 2021
@openshift-merge-robot openshift-merge-robot merged commit 912b374 into openshift:master Jul 21, 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