Kubernetes Submit Queue
0e097af8d8
Merge pull request #65952 from luxas/kubeadm_init_join_exclusive
Automatic merge from submit-queue (batch tested with PRs 63877, 64559, 65952). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
kubeadm: Make the kubeadm config kinds mutually exclusive
**What this PR does / why we need it**:
Right now it would be possible to feed kubeadm with a YAML document with all the four different Config kinds kubeadm at HEAD supports, `MasterConfiguration`, `InitConfiguration`, `JoinConfiguration` and `NodeConfiguration`. This PR makes them mutually exclusive so that kubeadm can know how to handle the config file properly.
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
ref: kubernetes/kubeadm#911
Depends on:
- [x] https://github.com/kubernetes/kubernetes/pull/65776
- [x] https://github.com/kubernetes/kubernetes/pull/65628
- [x] https://github.com/kubernetes/kubernetes/pull/65629
- [x] https://github.com/kubernetes/kubernetes/pull/65631
- [x] https://github.com/kubernetes/kubernetes/pull/65940
- [x] https://github.com/kubernetes/kubernetes/pull/65787
- [x] https://github.com/kubernetes/kubernetes/pull/65945
- [x] https://github.com/kubernetes/kubernetes/pull/65951
**Special notes for your reviewer**:
Please only review the last commit
**Release note**:
```release-note
NONE
```
@kubernetes/sig-cluster-lifecycle-pr-reviews
2018-07-16 17:00:09 -07:00
..
2018-05-04 17:02:20 -04:00
2018-07-02 07:14:34 -07:00
2018-07-05 15:01:19 +02:00
2018-05-04 17:02:20 -04:00
2018-06-22 16:22:57 -07:00
2018-06-22 16:22:57 -07:00
2018-06-22 16:22:57 -07:00
2018-02-16 13:43:01 -08:00
2018-05-04 17:02:20 -04:00
2018-06-22 16:22:57 -07:00
2018-05-10 12:50:28 -04:00
2018-07-13 13:22:04 -07:00
2018-07-09 08:07:04 -07:00
2018-07-12 15:14:16 -07:00
2018-07-04 19:20:12 +02:00
2018-07-16 17:00:09 -07:00
2018-06-22 16:22:57 -07:00
2018-07-09 14:09:48 -07:00
2018-07-06 16:07:15 +02:00
2018-02-16 13:43:01 -08:00
2018-02-15 12:01:00 -08:00
2017-01-19 11:29:16 -08:00