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.

Sign up for GitHub

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

Jump to bottom

kubeadm: Allow mixing Init and Join Configurations #69426

Merged
merged 1 commit into from
Oct 5, 2018
Merged

kubeadm: Allow mixing Init and Join Configurations #69426

merged 1 commit into from
Oct 5, 2018
+37 −17

Conversation

rosti
Copy link
Contributor

@rosti rosti commented Oct 4, 2018

What this PR does / why we need it:

This change allows mixing InitConfiguration/ClusterConfiguration with
JoinConfiguration in a single YAML file, by performing the following changes:

  • Replace the explicit error in DetectUnsupportedVersion with a warning.
  • Modify NodeConfigFileAndDefaultsToInternalConfig to use only
    JoinConfiguration.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Refs kubernetes/kubeadm#1152 (This is the short-term 1.12 solution to unblock the community).

Special notes for your reviewer:
/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/kind bug
/assign @fabriziopandini
/assign @timothysc
/cc @neolit123

Release note:

kubeadm now allows mixing of init/cluster and join configuration in a single YAML file (although a warning gets printed in this case).

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. area/kubeadm size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 4, 2018
@k8s-ci-robot k8s-ci-robot requested a review from neolit123 October 4, 2018 14:02
@fabriziopandini
Copy link
Member

Thanks for this fix!
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 4, 2018
timothysc
timothysc approved these changes Oct 4, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

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

@rosti Thank you for doing this!

/approve

minor comments, once you address LGTM

Also, we need to try and get this cherry-picked today!

cmd/kubeadm/app/util/config/common.go Outdated
}
}
if mutuallyExclusiveCount > 1 {
glog.Warningf("WARNING: configuration kinds %v are mutually exclusive", mutuallyExclusive)
Copy link
Member

Choose a reason for hiding this comment

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

I wouldn't say mutually exclusive here, b/c if it were there would be an error.

Maybe
"Detected resource kinds that may not apply: %v"

cmd/kubeadm/app/util/config/common_test.go Outdated
{
name: "MustNotMixInitJoin",
name: "CanMixInitJoin",
Copy link
Member

Choose a reason for hiding this comment

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

Could you put a comment above this test.
To the casual reader this would be confusing.

@rosti rosti force-pushed the allow-init-join-mix branch from ef05120 to d5460b5 Compare October 4, 2018 22:21
timothysc
timothysc approved these changes Oct 4, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2018
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

1 similar comment
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@rosti
kubeadm: Allow mixing Init and Join Configurations
f0d82fb 
This change allows mixing InitConfiguration/ClusterConfiguration with
JoinConfiguration in a single YAML file, by performing the following changes:

- Replace the explicit error in `DetectUnsupportedVersion` with a warning.
- Modify `NodeConfigFileAndDefaultsToInternalConfig` to use only
  `JoinConfiguration`.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
@rosti rosti force-pushed the allow-init-join-mix branch from d5460b5 to f0d82fb Compare October 5, 2018 07:47
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 5, 2018
@fabriziopandini
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 5, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, rosti, timothysc

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

@rosti
Copy link
Contributor Author

rosti commented Oct 5, 2018

Thanks for the quick reaction @fabriziopandini !

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@rosti
Copy link
Contributor Author

rosti commented Oct 5, 2018

/test pull-kubernetes-e2e-gce
/test pull-kubernetes-e2e-kops-aws

@k8s-ci-robot k8s-ci-robot merged commit 1aba19a into kubernetes:master Oct 5, 2018
@rosti rosti mentioned this pull request Oct 5, 2018
Merged
k8s-ci-robot added a commit that referenced this pull request Oct 5, 2018
@k8s-ci-robot
Merge pull request #69463 from rosti/automated-cherry-pick-of-#69426-…
4ed3216 
…upstream-release-1.12

Automated cherry pick of #69426: kubeadm: Allow mixing Init and Join Configurations
@rosti rosti deleted the allow-init-join-mix branch November 22, 2018 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 approved these changes

@timothysc timothysc timothysc approved these changes

Assignees

@timothysc timothysc

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", 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. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rosti @fabriziopandini @fejta-bot @k8s-ci-robot @timothysc @neolit123