External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-19 23:07:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

robust handling of API server SANs (#4435)

Browse Source 
* robust handling of API server SANs

* use apiserver_loadbalancer_domain_name if it is defined, according to PR 3977
This commit is contained in:
rptaylor
2019-04-08 08:10:35 -07:00
committed by Kubernetes Prow Robot
parent 09bbdadcee
commit f52584a715
5 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View File

@@ -193,7 +193,7 @@ apiServerExtraVolumes:
{% endif %}
{% endif %}
apiServerCertSANs:
{% for san in apiserver_sans.split() | unique %}
{% for san in apiserver_sans %}
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_cert_dir }}

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

@@ -211,7 +211,7 @@ schedulerExtraArgs:
{% endfor %}
{% endif %}
apiServerCertSANs:
{% for san in apiserver_sans.split() | unique %}
{% for san in apiserver_sans %}
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_cert_dir }}

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View File

@@ -43,7 +43,7 @@ controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.po
controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ kube_apiserver_port }}
{% endif %}
apiServerCertSANs:
{% for san in apiserver_sans.split() | unique %}
{% for san in apiserver_sans %}
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_cert_dir }}

2
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View File

@@ -176,7 +176,7 @@ apiServer:
{% endif %}
{% endif %}
certSANs:
{% for san in apiserver_sans.split() | unique %}
{% for san in apiserver_sans %}
- {{ san }}
{% endfor %}
timeoutForControlPlane: 5m0s