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

Automated cherry pick of #69426: kubeadm: Allow mixing Init and Join Configurations #69463

Merged
merged 1 commit into from Oct 5, 2018
Merged

Automated cherry pick of #69426: kubeadm: Allow mixing Init and Join Configurations #69463

merged 1 commit into from Oct 5, 2018

Commits on Oct 5, 2018

  1. kubeadm: Allow mixing Init and Join Configurations 

    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 committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    9109e62 View commit details
    Browse the repository at this point in the history