Pass 2: k8s GCR vanity URL

kubernetes · Apr 9, 2018 · b27a989 · b27a989
1 parent 0bd8f88
commit b27a989
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/deploy/addons/addon-manager.yaml b/deploy/addons/addon-manager.yaml
@@ -25,7 +25,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager:v8.6
+    image: k8s.gcr.io/kube-addon-manager:v8.6
     env:
     - name: KUBECONFIG
       value: /var/lib/localkube/kubeconfig

diff --git a/deploy/addons/efk/elasticsearch-rc.yaml b/deploy/addons/efk/elasticsearch-rc.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: elasticsearch-logging
-        image: gcr.io/google-containers/elasticsearch:v5.6.2
+        image: k8s.gcr.io/elasticsearch:v5.6.2
         resources:
           limits:
             cpu: 500m

diff --git a/deploy/addons/efk/fluentd-es-rc.yaml b/deploy/addons/efk/fluentd-es-rc.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: fluentd-es
-        image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.2
+        image: k8s.gcr.io/fluentd-elasticsearch:v2.0.2
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

diff --git a/deploy/addons/metrics-server/metrics-server-deployment.yaml b/deploy/addons/metrics-server/metrics-server-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: metrics-server
-        image: gcr.io/google_containers/metrics-server-amd64:v0.2.1
+        image: k8s.gcr.io/metrics-server-amd64:v0.2.1
         imagePullPolicy: Always
         command:
         - /metrics-server

diff --git a/deploy/docker/README.md b/deploy/docker/README.md
@@ -72,7 +72,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager:v6.5
+    image: k8s.gcr.io/kube-addon-manager:v6.5
     imagePullPolicy: IfNotPresent
     resources:
       requests:

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
@@ -196,7 +196,7 @@ var LocalkubeCachedImages = []string{
 	"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5",
 
 	// Addon Manager
-	"gcr.io/google-containers/kube-addon-manager:v6.5",
+	"k8s.gcr.io/kube-addon-manager:v6.5",
 
 	// Pause
 	"k8s.gcr.io/pause-amd64:3.0",
@@ -211,7 +211,7 @@ func GetKubeadmCachedImages(version string) []string {
 		"k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1",
 
 		// Addon Manager
-		"gcr.io/google-containers/kube-addon-manager:v6.5",
+		"k8s.gcr.io/kube-addon-manager:v6.5",
 
 		// Pause
 		"k8s.gcr.io/pause-amd64:3.0",

diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
@@ -58,8 +58,8 @@ func CacheImagesForBootstrapper(version string, clusterBootstrapper string) erro
 // CacheImages will cache images on the host
 //
 // The cache directory currently caches images using the imagename_tag
-// For example, gcr.io/google-containers-kube-addon-manager:v6.5 would be
-// stored at $CACHE_DIR/gcr.io/google-containers/kube-addon-manager_v6.5
+// For example, k8s.gcr.io/kube-addon-manager:v6.5 would be
+// stored at $CACHE_DIR/k8s.gcr.io/kube-addon-manager_v6.5
 func CacheImages(images []string, cacheDir string) error {
 	var g errgroup.Group
 	for _, image := range images {