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

Address None provider and machine-controller bugs #227

Merged
merged 1 commit into from
Mar 5, 2019

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Mar 4, 2019

What this PR does / why we need it:

  • Cloud Provider functionality remains unchanged
  • Add MachineController.Provider API field which is used to configure machine-controller to use the specified provider
  • If Cloud Provider is set to None and MachineController Provider is set, deploy machine-controller and deploy workers if they're defined
  • If Cloud Provider is set to None and MachineController Provider is non-set or set to none, fail.
  • If MachineController.Deploy is set to false, skip deployment and skip all validation and defaulting.

Breaking API changes:

  • Provider.Credentials is moved to MachineController.Credentials

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #222

Special notes for your reviewer:

To do:

  • Populate CloudProvider in the workerset spec with MachineController.Provider
  • Consider renaming Provider to CloudProvider

Documentation:

Release note:

Move Provider.Credentials to MachineController.Credentials.
Introduce MachineController.Provider to be used for configuring machine-controller if Provider is set to None.
Provider None is now working as expected.

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 4, 2019
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 4, 2019
@kubermatic-bot kubermatic-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 5, 2019
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 5, 2019
* Cloud Provider functionality remains unchanged
* Add MachineController.Provider API field which is used to configure machine-controller to use the specified provider
* If Cloud Provider is set to None and MachineController Provider is set, deploy machine-controller and deploy workers if they're defined
* If Cloud Provider is set to None and MachineController Provider is non-set or set to none, fail.
* If MachineController.Deploy is set to false, skip deployment and skip all validation and defaulting.

Breaking API changes:
* Provider.Credentials is moved to MachineController.Credentials
@xmudrii xmudrii changed the title [WIP] Address None provider and machine-controller bugs Address None provider and machine-controller bugs Mar 5, 2019
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 5, 2019
@kron4eg
Copy link
Member

kron4eg commented Mar 5, 2019

/test pull-kubeone-e2e

@kron4eg kron4eg self-assigned this Mar 5, 2019
@kron4eg
Copy link
Member

kron4eg commented Mar 5, 2019

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 78b3640405f4b422bc910fa471656f59dcf35095

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2019
@kubermatic-bot kubermatic-bot merged commit a2d2f48 into master Mar 5, 2019
@kubermatic-bot kubermatic-bot deleted the none-provider branch March 5, 2019 10:12
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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provider 'none' is not working as expected
3 participants