Kubernetes Submit Queue fca2bd221d Merge pull request #61705 from jstangroome/jstangroome-kubeadm-nodecidrmasksize ...

Automatic merge from submit-queue (batch tested with PRs 61705, 61609, 62103, 62113, 62115). 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>.

Support overriding the --node-cidr-mask-size arg passed to kube-controller-manager

Fixes: https://github.com/kubernetes/kubeadm/issues/724

**Release note**:
```release-note
kubeadm config can now override the Node CIDR Mask Size passed to kube-controller-manager.
```

2018-04-04 10:27:09 -07:00

..

apis/kubeadm

kubeadm: Introduce controllable timeout on join

2018-04-03 14:05:02 +03:00

cmd

Merge pull request #60581 from lioncruise/patch-7

2018-03-20 02:37:23 -07:00

constants

Bump to etcd 3.1.12 to pick up critical fix

2018-03-09 14:28:23 -08:00

discovery

kubeadm: Introduce controllable timeout on join

2018-04-03 14:05:02 +03:00

features

Merge pull request #58828 from rajansandeep/configtranslate

2018-03-05 06:56:48 -08:00

images

Autogenerated: hack/update-bazel.sh

2018-02-16 13:43:01 -08:00

phases

Ensure ControllerManagerExtraArgs take precedence over generated args

2018-03-29 16:43:14 +11:00

preflight

Merge pull request #59057 from JordanFaust/add-cri-socket-to-kubeadm-master-manifest

2018-02-21 04:22:31 -08:00

util

Update liveness probes to exec etcdctl /w mTLS for kubeadm etcd static pods

2018-03-04 19:25:19 -07:00

BUILD

Minor cleanup in kubeadm.

2017-11-23 20:32:09 +08:00

kubeadm.go

kubeadm-doc-preflight

2017-11-16 10:20:22 +01:00