From ca73e29ec5d4f78c7293ef81f6bb8476e86e9e3c Mon Sep 17 00:00:00 2001 From: Florent Monbillard Date: Fri, 13 Mar 2020 17:41:48 -0400 Subject: [PATCH] Use k8s.gcr.io for kubernetes related images (#5764) * Use k8s.gcr.io for kubernetes related images * Use k8s.gcr.io in inventory sample --- inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 +- roles/download/defaults/main.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml index af2a0170a..0d3792ab2 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml @@ -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) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index e84658f4c..3212a3d95 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -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"