External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-18 11:40:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Use imageRepository instead of the unifiedControlPlaneImage (#3484)

Browse Source
This commit is contained in:
Rong Zhang
2018-10-16 22:26:04 +08:00
committed by k8s-ci-robot
parent cf4dd645a7
commit 76fe84fe93
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View File

@@ -154,7 +154,8 @@ apiServerCertSANs:
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_config_dir }}/ssl
unifiedControlPlaneImage: "{{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}"
imageRepository: {{ kube_image_repo }}
unifiedControlPlaneImage: ""
{% if kube_override_hostname|default('') %}
nodeName: {{ kube_override_hostname }}
{% endif %}

3
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@@ -164,7 +164,8 @@ apiServerCertSANs:
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_config_dir }}/ssl
unifiedControlPlaneImage: "{{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}"
imageRepository: {{ kube_image_repo }}
unifiedControlPlaneImage: ""
nodeRegistration:
{% if kube_override_hostname|default('') %}
name: {{ kube_override_hostname }}

3
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View File

@@ -142,7 +142,8 @@ apiServerCertSANs:
- {{ san }}
{% endfor %}
certificatesDir: {{ kube_config_dir }}/ssl
unifiedControlPlaneImage: "{{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}"
imageRepository: {{ kube_image_repo }}
unifiedControlPlaneImage: ""
---
apiVersion: kubeproxy.config.k8s.io/v1alpha1
kind: KubeProxyConfiguration