epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-27 04:10:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

More Feature/2.8 backports for 2.8.1 (#3911)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@@ -21,7 +21,6 @@ networking:
dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }}
podSubnet: {{ kube_pods_subnet }}
podNetworkCidr: "{{ kube_network_node_prefix }}"
kubernetesVersion: {{ kube_version }}
kubeProxy:
config:
@@ -119,6 +118,7 @@ controllerManagerExtraArgs:
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }}
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
node-cidr-mask-size: "{{ kube_network_node_prefix }}"
profiling: "{{ kube_profiling }}"
terminated-pod-gc-threshold: "{{ kube_controller_terminated_pod_gc_threshold }}"
{% if kube_feature_gates %}
@@ -189,7 +189,7 @@ schedulerExtraArgs:
{% endfor %}
{% endif %}
apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %}
{% for san in apiserver_sans.split() | unique %}
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_config_dir }}/ssl