From 8984096f3572f8f339f824770b24dde79e65bdb4 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 18 Sep 2019 04:33:28 +0300 Subject: [PATCH] use hyperkubeimage to run controlplane containers (#5178) --- roles/kubernetes/master/defaults/main/main.yml | 3 +++ .../kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/master/defaults/main/main.yml b/roles/kubernetes/master/defaults/main/main.yml index 4cdd20979..ae34bf167 100644 --- a/roles/kubernetes/master/defaults/main/main.yml +++ b/roles/kubernetes/master/defaults/main/main.yml @@ -172,3 +172,6 @@ kube_override_hostname: >- {%- endif -%} secrets_encryption_query: "resources[*].providers[0].{{kube_encryption_algorithm}}.keys[0].secret" + +# use HyperKube image to control plane containers +kubeadm_use_hyperkube_image: False diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index eeb557d3f..961ab5b88 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -91,7 +91,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku {% endif %} certificatesDir: {{ kube_cert_dir }} imageRepository: {{ kube_image_repo }} -useHyperKubeImage: false +useHyperKubeImage: {{ kubeadm_use_hyperkube_image }} apiServer: extraArgs: {% if kube_api_anonymous_auth is defined %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 index 0bd64cd00..1f3031430 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 @@ -94,7 +94,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku {% endif %} certificatesDir: {{ kube_cert_dir }} imageRepository: {{ kube_image_repo }} -useHyperKubeImage: false +useHyperKubeImage: {{ kubeadm_use_hyperkube_image }} apiServer: extraArgs: {% if kube_api_anonymous_auth is defined %}