Skip to content

Use config file to join nodes to the cluster [fixed]#632

Merged
k8s-ci-robot merged 9 commits intokubernetes-sigs:masterfrom
BenTheElder:616-nits
Jun 19, 2019
Merged

Use config file to join nodes to the cluster [fixed]#632
k8s-ci-robot merged 9 commits intokubernetes-sigs:masterfrom
BenTheElder:616-nits

Conversation

@BenTheElder
Copy link
Copy Markdown
Member

follow up to #616

  • fix v1.11 (only include MasterConfiguration or NodeConfiguration in the generated file)
  • fix logic bug / race sharing config inputs

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 19, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2019
@k8s-ci-robot k8s-ci-robot requested review from aojea and munnerz June 19, 2019 23:13
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 19, 2019
@BenTheElder BenTheElder requested a review from amwat June 19, 2019 23:13
return err
}
if len(workers) > 0 {
kubeadmClusterConfig.ControlPlane = false
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

if we have any workers this always caused all of the nodes to get false for this, this commit fixes it

@krzyzacy
Copy link
Copy Markdown

rubber stamping given #616 is already approved

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 19, 2019
@k8s-ci-robot k8s-ci-robot merged commit 883eaf9 into kubernetes-sigs:master Jun 19, 2019
@BenTheElder BenTheElder deleted the 616-nits branch June 19, 2019 23:51
@BenTheElder BenTheElder mentioned this pull request Jun 19, 2019
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

4 participants