More Feature/2.8 backports for 2.8.1 (#3911)

* Move node-cidr-mask-size to ControllerManagerextraArgs (#3845)

* Fix apiServerCertSANs in kubeadm config file (#3839)

* Backport #3908

* Update kubernetes to 1.12.4
This commit is contained in:
Bort Verwilst
2018-12-26 06:43:03 +01:00
committed by Kubernetes Prow Robot
parent 2d6e31d281
commit 2ac1c7562f
6 changed files with 16 additions and 12 deletions

View File

@@ -114,7 +114,7 @@ Supported Components
--------------------
- Core
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.12.3
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.12.4
- [etcd](https://github.com/coreos/etcd) v3.2.24
- [docker](https://www.docker.com/) v18.06 (see note)
- [rkt](https://github.com/rkt/rkt) v1.21.0 (see Note 2)