Support for disabling apiserver insecure port

This allows `kube_apiserver_insecure_port` to be set to 0 (disabled).

Rework of #1937 with kubeadm support

Also, fixed an issue in `kubeadm-migrate-certs` where the old apiserver cert was copied as the kubeadm key
This commit is contained in:
Chad Swenson
2017-11-06 14:01:10 -06:00
parent c2347db934
commit b8788421d5
8 changed files with 44 additions and 8 deletions

View File

@@ -111,9 +111,17 @@ spec:
httpGet:
host: 127.0.0.1
path: /healthz
{% if kube_apiserver_insecure_port == 0 %}
port: {{ kube_apiserver_port }}
scheme: HTTPS
{% else %}
port: {{ kube_apiserver_insecure_port }}
initialDelaySeconds: 30
timeoutSeconds: 10
{% endif %}
failureThreshold: 8
initialDelaySeconds: 15
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 15
volumeMounts:
- mountPath: {{ kube_config_dir }}
name: kubernetes-config