diff --git a/roles/download/templates/kubeadm-images.yaml.j2 b/roles/download/templates/kubeadm-images.yaml.j2 index e75f62e487fb10046bf79ec6f956a16ca2b744b6..a57043c4071ea62dce732f6acc64b1172fb618cd 100644 --- a/roles/download/templates/kubeadm-images.yaml.j2 +++ b/roles/download/templates/kubeadm-images.yaml.j2 @@ -7,6 +7,7 @@ apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration imageRepository: {{ kube_image_repo }} kubernetesVersion: {{ kube_version }} +useHyperKubeImage: {{ kubeadm_use_hyperkube_image }} etcd: external: endpoints: diff --git a/roles/kubernetes/master/defaults/main/main.yml b/roles/kubernetes/master/defaults/main/main.yml index ae34bf1673f49dd433c6cfbb355a93961061e036..4cdd20979af1b93c0550fa6a274c1a8d21956bca 100644 --- a/roles/kubernetes/master/defaults/main/main.yml +++ b/roles/kubernetes/master/defaults/main/main.yml @@ -172,6 +172,3 @@ 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/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 4945fdd2e86af2c057ef325825ee38055743fe2a..dda1f5c743897e79bfee57a57b2425a198db6726 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -17,6 +17,9 @@ kube_version: v1.15.3 ## The minimum version working kube_version_min_required: v1.14.0 +# use HyperKube image to control plane containers +kubeadm_use_hyperkube_image: False + ## Kube Proxy mode One of ['iptables','ipvs'] kube_proxy_mode: ipvs