From c9ed5f69d730f495ebf2e33bda7b024c2e47565f Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Thu, 25 Apr 2019 11:34:46 +0300 Subject: [PATCH] Prepend docker.io for all docker hub images (#4648) Change-Id: I71dc793641bc168e40419e38f33f68f5325e77a9 --- roles/download/defaults/main.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 26697aa4c..c483a5e3f 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -183,7 +183,7 @@ calico_rr_image_repo: "docker.io/calico/routereflector" calico_rr_image_tag: "{{ calico_rr_version }}" pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}" pod_infra_image_tag: "{{ pod_infra_version }}" -install_socat_image_repo: "xueshanf/install-socat" +install_socat_image_repo: "docker.io/xueshanf/install-socat" install_socat_image_tag: "latest" netcheck_version: "v1.0" netcheck_agent_image_repo: "quay.io/l23network/k8s-netchecker-agent" @@ -194,32 +194,32 @@ weave_kube_image_repo: "docker.io/weaveworks/weave-kube" weave_kube_image_tag: "{{ weave_version }}" weave_npc_image_repo: "docker.io/weaveworks/weave-npc" weave_npc_image_tag: "{{ weave_version }}" -contiv_image_repo: "contiv/netplugin" +contiv_image_repo: "docker.io/contiv/netplugin" contiv_image_tag: "{{ contiv_version }}" -contiv_init_image_repo: "contiv/netplugin-init" +contiv_init_image_repo: "docker.io/contiv/netplugin-init" contiv_init_image_tag: "latest" -contiv_auth_proxy_image_repo: "contiv/auth_proxy" +contiv_auth_proxy_image_repo: "docker.io/contiv/auth_proxy" contiv_auth_proxy_image_tag: "{{ contiv_version }}" -contiv_etcd_init_image_repo: "ferest/etcd-initer" +contiv_etcd_init_image_repo: "docker.io/ferest/etcd-initer" contiv_etcd_init_image_tag: latest -contiv_ovs_image_repo: "contiv/ovs" +contiv_ovs_image_repo: "docker.io/contiv/ovs" contiv_ovs_image_tag: "latest" cilium_image_repo: "docker.io/cilium/cilium" cilium_image_tag: "{{ cilium_version }}" cilium_init_image_repo: "docker.io/library/busybox" cilium_init_image_tag: "1.28.4" -kube_router_image_repo: "cloudnativelabs/kube-router" +kube_router_image_repo: "docker.io/cloudnativelabs/kube-router" kube_router_image_tag: "{{ kube_router_version }}" multus_image_repo: "docker.io/nfvpe/multus" multus_image_tag: "{{ multus_version }}" -nginx_image_repo: nginx +nginx_image_repo: docker.io/nginx nginx_image_tag: 1.15 -haproxy_image_repo: haproxy +haproxy_image_repo: docker.io/haproxy haproxy_image_tag: 1.9 coredns_version: "1.5.0" -coredns_image_repo: "coredns/coredns" +coredns_image_repo: "docker.io/coredns/coredns" coredns_image_tag: "{{ coredns_version }}" nodelocaldns_version: "1.15.1" @@ -229,17 +229,17 @@ nodelocaldns_image_tag: "{{ nodelocaldns_version }}" dnsautoscaler_version: 1.4.0 dnsautoscaler_image_repo: "k8s.gcr.io/cluster-proportional-autoscaler-{{ image_arch }}" dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}" -test_image_repo: busybox +test_image_repo: docker.io/busybox test_image_tag: latest -busybox_image_repo: busybox +busybox_image_repo: docker.io/busybox busybox_image_tag: 1.29.2 helm_version: "v2.13.1" -helm_image_repo: "lachlanevenson/k8s-helm" +helm_image_repo: "docker.io/lachlanevenson/k8s-helm" helm_image_tag: "{{ helm_version }}" tiller_image_repo: "gcr.io/kubernetes-helm/tiller" tiller_image_tag: "{{ helm_version }}" -registry_image_repo: "registry" +registry_image_repo: "docker.io/registry" registry_image_tag: "2.6" registry_proxy_image_repo: "gcr.io/google_containers/kube-registry-proxy" registry_proxy_image_tag: "0.4" @@ -252,7 +252,7 @@ cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner" cephfs_provisioner_image_tag: "v2.1.0-k8s1.11" rbd_provisioner_image_repo: "quay.io/external_storage/rbd-provisioner" rbd_provisioner_image_tag: "v2.1.1-k8s1.11" -local_path_provisioner_image_repo: "rancher/local-path-provisioner" +local_path_provisioner_image_repo: "docker.io/rancher/local-path-provisioner" local_path_provisioner_image_tag: "v0.0.2" ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller" ingress_nginx_controller_image_tag: "0.21.0"