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

Add upstream patch for --cloud-config option #180

Merged

Conversation

elmiko
Copy link

@elmiko elmiko commented Nov 9, 2020

This change brings in the upstream patch kubernetes#3203

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 9, 2020
@openshift-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@elmiko
Copy link
Author

elmiko commented Nov 9, 2020

opening this as draft because it needs the chain ending with #179 before it can merge, and there are 2 big commits that need to be merged.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2020
@elmiko elmiko force-pushed the openshift/add-cloud-config branch from dde0e46 to a3bf8d1 Compare November 20, 2020 20:15
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2020
@elmiko
Copy link
Author

elmiko commented Nov 20, 2020

rebased

@elmiko elmiko marked this pull request as ready for review November 30, 2020 21:29
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2020
@elmiko
Copy link
Author

elmiko commented Nov 30, 2020

this is ready for review, but still needs to wait for #179
/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 30, 2020
@elmiko elmiko force-pushed the openshift/add-cloud-config branch from a3bf8d1 to d45f4f8 Compare December 1, 2020 20:43
@elmiko
Copy link
Author

elmiko commented Dec 1, 2020

this should go before #184

Copy link

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/approve

The additional commit here is relatively straight forward, no issues from my side

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 8, 2020
…api provider

- Leverage --cloud-config to allow for providing a separate kubeconfig for Cluster API management and workload cluster resources
- Allow for fallback to previous behavior when --cloud-config is not specified for backward compatibility
- Provides a --clusterapi-cloud-config-authoritative flag to disable the above fallback behavior and allow for both the management and workload cluster clients to use the in-cluster config
@elmiko elmiko force-pushed the openshift/add-cloud-config branch from d45f4f8 to 61b8048 Compare December 9, 2020 16:33
@elmiko
Copy link
Author

elmiko commented Dec 9, 2020

rebased after 179 merged
/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 Dec 9, 2020
Copy link

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit 523b193 into openshift:master Dec 10, 2020
@elmiko elmiko deleted the openshift/add-cloud-config branch December 10, 2020 14:57
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.

6 participants