Use k8s.gcr.io for kubernetes related images (#5764)
* Use k8s.gcr.io for kubernetes related images * Use k8s.gcr.io in inventory samplepull/5399/head
parent
0330442c63
commit
ca73e29ec5
|
@ -23,7 +23,7 @@ kube_api_anonymous_auth: true
|
|||
kube_version: v1.16.8
|
||||
|
||||
# kubernetes image repo define
|
||||
kube_image_repo: "{{ gcr_image_repo }}/google-containers"
|
||||
kube_image_repo: "k8s.gcr.io"
|
||||
|
||||
# Where the binaries will be downloaded.
|
||||
# Note: ensure that you've enough disk space (about 1G)
|
||||
|
|
|
@ -55,7 +55,7 @@ etcd_version: v3.3.12
|
|||
|
||||
# gcr and kubernetes image repo define
|
||||
gcr_image_repo: "gcr.io"
|
||||
kube_image_repo: "{{ gcr_image_repo }}/google-containers"
|
||||
kube_image_repo: "k8s.gcr.io"
|
||||
|
||||
# docker image repo define
|
||||
docker_image_repo: "docker.io"
|
||||
|
@ -382,7 +382,7 @@ calico_policy_image_repo: "{{ docker_image_repo }}/calico/kube-controllers"
|
|||
calico_policy_image_tag: "{{ calico_policy_version }}"
|
||||
calico_typha_image_repo: "{{ docker_image_repo }}/calico/typha"
|
||||
calico_typha_image_tag: "{{ calico_typha_version }}"
|
||||
pod_infra_image_repo: "{{ gcr_image_repo }}/google_containers/pause-{{ image_arch }}"
|
||||
pod_infra_image_repo: "{{ kube_image_repo }}/pause"
|
||||
pod_infra_image_tag: "{{ pod_infra_version }}"
|
||||
install_socat_image_repo: "{{ docker_image_repo }}/xueshanf/install-socat"
|
||||
install_socat_image_tag: "latest"
|
||||
|
@ -452,10 +452,10 @@ tiller_image_tag: "{{ helm_version }}"
|
|||
|
||||
registry_image_repo: "{{ docker_image_repo }}/library/registry"
|
||||
registry_image_tag: "2.6"
|
||||
registry_proxy_image_repo: "{{ gcr_image_repo }}/google_containers/kube-registry-proxy"
|
||||
registry_proxy_image_repo: "{{ kube_image_repo }}/kube-registry-proxy"
|
||||
registry_proxy_image_tag: "0.4"
|
||||
metrics_server_version: "v0.3.6"
|
||||
metrics_server_image_repo: "{{ gcr_image_repo }}/google_containers/metrics-server-amd64"
|
||||
metrics_server_image_repo: "{{ kube_image_repo }}/metrics-server-{{ image_arch }}"
|
||||
metrics_server_image_tag: "{{ metrics_server_version }}"
|
||||
local_volume_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/local-volume-provisioner"
|
||||
local_volume_provisioner_image_tag: "v2.3.2"
|
||||
|
|
Loading…
Reference in New Issue