kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use hyperkubeimage to run controlplane containers (#5178)

pull/5146/head
Sergey 2019-09-18 04:33:28 +03:00 committed by Kubernetes Prow Robot
parent 1ce7831f6d
commit 8984096f35
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes/master/defaults/main/main.yml
View File

@ -172,3 +172,6 @@ kube_override_hostname: >-
{%- endif -%} {%- endif -%}
secrets_encryption_query: "resources[*].providers[0].{{kube_encryption_algorithm}}.keys[0].secret" secrets_encryption_query: "resources[*].providers[0].{{kube_encryption_algorithm}}.keys[0].secret"
# use HyperKube image to control plane containers
kubeadm_use_hyperkube_image: False

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

@ -91,7 +91,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
{% endif %} {% endif %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
useHyperKubeImage: false useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
apiServer: apiServer:
extraArgs: extraArgs:
{% if kube_api_anonymous_auth is defined %} {% if kube_api_anonymous_auth is defined %}

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

@ -94,7 +94,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
{% endif %} {% endif %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
useHyperKubeImage: false useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
apiServer: apiServer:
extraArgs: extraArgs:
{% if kube_api_anonymous_auth is defined %} {% if kube_api_anonymous_auth is defined %}