Use imageRepository instead of the unifiedControlPlaneImage (#3484)

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

View file

@ -21,6 +21,9 @@ kube_api_anonymous_auth: true
## Change this to use another Kubernetes version, e.g. a current beta release ## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.12.1 kube_version: v1.12.1
# kubernetes image repo define
kube_image_repo: "gcr.io/google-containers"
# Where the binaries will be downloaded. # Where the binaries will be downloaded.
# Note: ensure that you've enough disk space (about 1G) # Note: ensure that you've enough disk space (about 1G)
local_release_dir: "/tmp/releases" local_release_dir: "/tmp/releases"

View file

@ -39,6 +39,9 @@ kube_version: v1.12.1
kubeadm_version: "{{ kube_version }}" kubeadm_version: "{{ kube_version }}"
etcd_version: v3.2.24 etcd_version: v3.2.24
# kubernetes image repo define
kube_image_repo: "gcr.io/google-containers"
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download # after migration to container download
calico_version: "v3.1.3" calico_version: "v3.1.3"
@ -126,7 +129,7 @@ calico_policy_image_repo: "quay.io/calico/kube-controllers"
calico_policy_image_tag: "{{ calico_policy_version }}" calico_policy_image_tag: "{{ calico_policy_version }}"
calico_rr_image_repo: "quay.io/calico/routereflector" calico_rr_image_repo: "quay.io/calico/routereflector"
calico_rr_image_tag: "{{ calico_rr_version }}" calico_rr_image_tag: "{{ calico_rr_version }}"
hyperkube_image_repo: "gcr.io/google-containers/hyperkube-{{ image_arch }}" hyperkube_image_repo: "{{ kube_image_repo }}/hyperkube-{{ image_arch }}"
hyperkube_image_tag: "{{ kube_version }}" hyperkube_image_tag: "{{ kube_version }}"
pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}" pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}"
pod_infra_image_tag: "{{ pod_infra_version }}" pod_infra_image_tag: "{{ pod_infra_version }}"
@ -257,7 +260,7 @@ downloads:
- k8s-cluster - k8s-cluster
hyperkube: hyperkube:
enabled: true enabled: "{{ kubeadm_enabled == false }}"
container: true container: true
repo: "{{ hyperkube_image_repo }}" repo: "{{ hyperkube_image_repo }}"
tag: "{{ hyperkube_image_tag }}" tag: "{{ hyperkube_image_tag }}"

View file

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

View file

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

View file

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