From 51ee9a1423fa798df153835b5426d7da1065655c Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 22 Dec 2017 09:55:16 -0800 Subject: [PATCH] Convert registry to k8s.gcr.io --- Makefile | 2 +- README.md | 2 +- deploy/addons/dashboard/dashboard-rc.yaml | 2 +- deploy/addons/heapster/heapster-rc.yaml | 2 +- deploy/addons/heapster/influx-grafana-rc.yaml | 4 +-- deploy/addons/ingress/ingress-rc.yaml | 2 +- .../addons/kube-dns/kube-dns-controller.yaml | 6 ++-- pkg/minikube/constants/constants.go | 30 +++++++++---------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index e7f69ed2228f..7558918b4b09 100755 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ BUILDROOT_BRANCH ?= 2017.11 REGISTRY?=gcr.io/k8s-minikube HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3 -BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.9.1-1 +BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.9.1-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image ISO_VERSION ?= v0.24.0 diff --git a/README.md b/README.md index ef078b4211d5..7d632a3e7af6 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Connecting to cluster... Setting up kubeconfig... Kubectl is now configured to use the cluster. -$ kubectl run hello-minikube --image=gcr.io/google_containers/echoserver:1.4 --port=8080 +$ kubectl run hello-minikube --image=k8s.gcr.io/echoserver:1.4 --port=8080 deployment "hello-minikube" created $ kubectl expose deployment hello-minikube --type=NodePort service "hello-minikube" exposed diff --git a/deploy/addons/dashboard/dashboard-rc.yaml b/deploy/addons/dashboard/dashboard-rc.yaml index 22f7964f2973..a0af480fbe63 100644 --- a/deploy/addons/dashboard/dashboard-rc.yaml +++ b/deploy/addons/dashboard/dashboard-rc.yaml @@ -36,7 +36,7 @@ spec: spec: containers: - name: kubernetes-dashboard - image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.1 + image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1 imagePullPolicy: IfNotPresent ports: - containerPort: 9090 diff --git a/deploy/addons/heapster/heapster-rc.yaml b/deploy/addons/heapster/heapster-rc.yaml index 0f0d185ce22a..2f04ba0db1ee 100644 --- a/deploy/addons/heapster/heapster-rc.yaml +++ b/deploy/addons/heapster/heapster-rc.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: heapster - image: gcr.io/google_containers/heapster-amd64:v1.5.0 + image: k8s.gcr.io/heapster-amd64:v1.5.0 imagePullPolicy: IfNotPresent command: - /heapster diff --git a/deploy/addons/heapster/influx-grafana-rc.yaml b/deploy/addons/heapster/influx-grafana-rc.yaml index adcb2a7ecda8..328d4bdd1d0d 100644 --- a/deploy/addons/heapster/influx-grafana-rc.yaml +++ b/deploy/addons/heapster/influx-grafana-rc.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: influxdb - image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3 + image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3 imagePullPolicy: IfNotPresent ports: - name: http @@ -45,7 +45,7 @@ spec: - mountPath: /data name: influxdb-storage - name: grafana - image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3 + image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3 imagePullPolicy: IfNotPresent env: - name: INFLUXDB_SERVICE_URL diff --git a/deploy/addons/ingress/ingress-rc.yaml b/deploy/addons/ingress/ingress-rc.yaml index 1ca0f86cba5f..d120267338c9 100644 --- a/deploy/addons/ingress/ingress-rc.yaml +++ b/deploy/addons/ingress/ingress-rc.yaml @@ -36,7 +36,7 @@ spec: # Any image is permissable as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.4 + image: k8s.gcr.io/defaultbackend:1.4 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/deploy/addons/kube-dns/kube-dns-controller.yaml b/deploy/addons/kube-dns/kube-dns-controller.yaml index 53f5bea9add4..aa625ecd5d15 100644 --- a/deploy/addons/kube-dns/kube-dns-controller.yaml +++ b/deploy/addons/kube-dns/kube-dns-controller.yaml @@ -44,7 +44,7 @@ spec: optional: true containers: - name: kubedns - image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 + image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5 imagePullPolicy: IfNotPresent resources: # TODO: Set memory limits when we've profiled the container for large @@ -96,7 +96,7 @@ spec: - name: kube-dns-config mountPath: /kube-dns-config - name: dnsmasq - image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 + image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -135,7 +135,7 @@ spec: - name: kube-dns-config mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 + image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 1eca5fa8324b..29a93f27cc87 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -168,18 +168,18 @@ const FileScheme = "file" var LocalkubeCachedImages = []string{ // Dashboard - "gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3", + "k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3", // DNS - "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5", - "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5", - "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5", + "k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5", + "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5", + "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5", // Addon Manager "gcr.io/google-containers/kube-addon-manager:v6.4-beta.2", // Pause - "gcr.io/google_containers/pause-amd64:3.0", + "k8s.gcr.io/pause-amd64:3.0", //Storage Provisioner "gcr.io/k8s-minikube/storage-provisioner:v1.8.0", @@ -188,26 +188,26 @@ var LocalkubeCachedImages = []string{ func GetKubeadmCachedImages(version string) []string { return []string{ // Dashboard - "gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3", + "k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3", // Addon Manager "gcr.io/google-containers/kube-addon-manager:v6.4-beta.2", // Pause - "gcr.io/google_containers/pause-amd64:3.0", + "k8s.gcr.io/pause-amd64:3.0", // DNS - "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4", - "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4", - "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4", + "k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.4", + "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.4", + "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.4", // etcd - "gcr.io/google_containers/etcd-amd64:3.0.17", + "k8s.gcr.io/etcd-amd64:3.0.17", - "gcr.io/google_containers/kube-proxy-amd64:" + version, - "gcr.io/google_containers/kube-scheduler-amd64:" + version, - "gcr.io/google_containers/kube-controller-manager-amd64:" + version, - "gcr.io/google_containers/kube-apiserver-amd64:" + version, + "k8s.gcr.io/kube-proxy-amd64:" + version, + "k8s.gcr.io/kube-scheduler-amd64:" + version, + "k8s.gcr.io/kube-controller-manager-amd64:" + version, + "k8s.gcr.io/kube-apiserver-amd64:" + version, //Storage Provisioner "gcr.io/k8s-minikube/storage-provisioner:v1.8.0",