Browse Source
Return the ability to start control plain from the hyperkube image (#5422)
pull/5977/head
Sergey
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
6 additions and
0 deletions
-
roles/download/templates/kubeadm-images.yaml.j2
-
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
-
roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
-
roles/kubespray-defaults/defaults/main.yaml
|
|
|
@ -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: |
|
|
|
|
|
|
|
@ -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 %} |
|
|
|
|
|
|
|
@ -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 %} |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
|
