C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return the ability to start control plain from the hyperkube image (#5422)

Browse source
This commit is contained in:
Sergey 2020-04-18 15:59:36 +03:00 committed by GitHub
parent 8618a3119b
commit 6318bb9f96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/download/templates/kubeadm-images.yaml.j2
View file

@ -7,6 +7,7 @@ apiVersion: kubeadm.k8s.io/v1beta1
kind: ClusterConfiguration kind: ClusterConfiguration
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
kubernetesVersion: {{ kube_version }} kubernetesVersion: {{ kube_version }}
useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
etcd: etcd:
{% if etcd_kubeadm_enabled %} {% if etcd_kubeadm_enabled %}
local: local:

1
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -95,6 +95,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: {{ kubeadm_use_hyperkube_image }}
apiServer: apiServer:
extraArgs: extraArgs:
{% if kube_api_anonymous_auth is defined %} {% if kube_api_anonymous_auth is defined %}

1
roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
View file

@ -98,6 +98,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: {{ kubeadm_use_hyperkube_image }}
apiServer: apiServer:
extraArgs: extraArgs:
{% if kube_api_anonymous_auth is defined %} {% if kube_api_anonymous_auth is defined %}

3
roles/kubespray-defaults/defaults/main.yaml
View file

@ -20,6 +20,9 @@ kube_version: v1.17.5
## The minimum version working ## The minimum version working
kube_version_min_required: v1.16.0 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 One of ['iptables','ipvs']
kube_proxy_mode: ipvs kube_proxy_mode: ipvs