diff --git a/roles/download/templates/kubeadm-images.yaml.j2 b/roles/download/templates/kubeadm-images.yaml.j2 index be148196b7eebca9677eb779508b41f2c234de69..ec31ea43c6878549e09f7c2cfb2b2a45ea59a176 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: {% if etcd_kubeadm_enabled %} local: diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index 63bd818d22130144f28bc547fa2f045bf8419667..e0276e2deab6faa64395e2d6d6484d6dca434e67 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -95,6 +95,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku {% endif %} certificatesDir: {{ kube_cert_dir }} imageRepository: {{ kube_image_repo }} +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 c0bdd0398854ebdfe5eaae2ac7887a98f0d67abc..9809692b0223a1d24efb43b327557b7beebe3808 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 @@ -98,6 +98,7 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku {% endif %} certificatesDir: {{ kube_cert_dir }} imageRepository: {{ kube_image_repo }} +useHyperKubeImage: {{ kubeadm_use_hyperkube_image }} apiServer: extraArgs: {% if kube_api_anonymous_auth is defined %} diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 547e627407dfda0eaa9acb3aecc2648f8e9a4397..c6e21a9799b9e76891740c0eeafbedf45fe1eea1 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -20,6 +20,9 @@ kube_version: v1.17.5 ## The minimum version working kube_version_min_required: v1.16.0 +# use HyperKube image to control plane containers +kubeadm_use_hyperkube_image: False + ## Kube Proxy mode One of ['iptables','ipvs'] kube_proxy_mode: ipvs