From 1cf6a99df4b2a85806d7185e6f649460ec4fe3dd Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 26 Sep 2019 04:03:06 +0300 Subject: [PATCH] generate kubeadm download image list with options useHyperKubeImage (#5203) --- roles/download/templates/kubeadm-images.yaml.j2 | 1 + roles/kubernetes/master/defaults/main/main.yml | 3 --- roles/kubespray-defaults/defaults/main.yaml | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/download/templates/kubeadm-images.yaml.j2 b/roles/download/templates/kubeadm-images.yaml.j2 index e75f62e48..a57043c40 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 ae34bf167..4cdd20979 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 4945fdd2e..dda1f5c74 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