Merge pull request #1919 from thockin-tmp/gcr-vanity

x13n · web-flow · commit 41d1a0e6c394 · 2017-12-29T12:11:53.000+01:00
Convert registry to k8s.gcr.io
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 all: build
 
-PREFIX?=gcr.io/google_containers
+PREFIX?=k8s.gcr.io
 FLAGS=
 ARCH?=amd64
 ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
diff --git a/deploy/kube-config/google/heapster.yaml b/deploy/kube-config/google/heapster.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: heapster
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: IfNotPresent
         command:
         - /heapster
diff --git a/deploy/kube-config/influxdb/grafana.yaml b/deploy/kube-config/influxdb/grafana.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: grafana
-        image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
+        image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
         ports:
         - containerPort: 3000
           protocol: TCP
diff --git a/deploy/kube-config/influxdb/heapster.yaml b/deploy/kube-config/influxdb/heapster.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: heapster
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: IfNotPresent
         command:
         - /heapster
diff --git a/deploy/kube-config/influxdb/influxdb.yaml b/deploy/kube-config/influxdb/influxdb.yaml
@@ -13,7 +13,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
         volumeMounts:
         - mountPath: /data
           name: influxdb-storage
diff --git a/deploy/kube-config/standalone-test/heapster-controller.yaml b/deploy/kube-config/standalone-test/heapster-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: heapster-test
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: Always
         command:
         - /heapster
diff --git a/deploy/kube-config/standalone-test/heapster-summary-controller.yaml b/deploy/kube-config/standalone-test/heapster-summary-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: heapster-test
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: Always
         command:
         - /heapster
@@ -28,7 +28,7 @@ spec:
           mountPath: /etc/ssl/certs
           readOnly: true
       - name: eventer-test
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: Always
         command:
         - /eventer
diff --git a/deploy/kube-config/standalone-with-apiserver/heapster-deployment.yaml b/deploy/kube-config/standalone-with-apiserver/heapster-deployment.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         command:
         - /heapster
         - --source=kubernetes.summary_api:''
diff --git a/deploy/kube-config/standalone/heapster-controller.yaml b/deploy/kube-config/standalone/heapster-controller.yaml
@@ -20,7 +20,7 @@ spec:
       serviceAccountName: heapster
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster-amd64:v1.4.2
+        image: k8s.gcr.io/heapster-amd64:v1.4.2
         imagePullPolicy: IfNotPresent
         command:
         - /heapster
diff --git a/grafana/Makefile b/grafana/Makefile
@@ -15,18 +15,18 @@
 # Build the influxdb image for amd64, arm, arm64, ppc64le and s390x
 #
 # Usage:
-# 	[PREFIX=gcr.io/google_containers] [ARCH=amd64] make (build|push)
+# 	[PREFIX=k8s.gcr.io] [ARCH=amd64] make (build|push)
 
 all: build
 
 VERSION?=v4.4.3
 DEB_VERSION?=4.4.3
 
-PREFIX?=gcr.io/google_containers
+PREFIX?=k8s.gcr.io
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
 LDFLAGS=-w -X main.version=$(VERSION) -X main.commit=unknown-dev -X main.timestamp=0 -extldflags '-static'
-KUBE_CROSS_IMAGE=gcr.io/google_containers/kube-cross:v1.8.3-2
+KUBE_CROSS_IMAGE=k8s.gcr.io/kube-cross:v1.8.3-2
 
 ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
 ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
diff --git a/influxdb/Makefile b/influxdb/Makefile
@@ -15,12 +15,12 @@
 # Build the influxdb image for amd64, arm, arm64, ppc64le and s390x
 #
 # Usage:
-# 	[PREFIX=gcr.io/google_containers] [ARCH=amd64] make (build|push)
+# 	[PREFIX=k8s.gcr.io] [ARCH=amd64] make (build|push)
 
 all: build
 
 VERSION?=v1.3.3
-PREFIX?=gcr.io/google_containers
+PREFIX?=k8s.gcr.io
 ARCH?=amd64
 GOLANG_VERSION=1.8
 TEMP_DIR:=$(shell mktemp -d)
diff --git a/metrics/processors/pod_based_enricher_test.go b/metrics/processors/pod_based_enricher_test.go
@@ -94,7 +94,7 @@ func TestPodEnricher(t *testing.T) {
 			Containers: []kube_api.Container{
 				{
 					Name:  "c1",
-					Image: "gcr.io/google_containers/pause:2.0",
+					Image: "k8s.gcr.io/pause:2.0",
 					Resources: kube_api.ResourceRequirements{
 						Requests: kube_api.ResourceList{
 							kube_api.ResourceCPU:    *resource.NewMilliQuantity(100, resource.DecimalSI),
@@ -104,7 +104,7 @@ func TestPodEnricher(t *testing.T) {
 				},
 				{
 					Name:  "nginx",
-					Image: "gcr.io/google_containers/pause:2.0",
+					Image: "k8s.gcr.io/pause:2.0",
 					Resources: kube_api.ResourceRequirements{
 						Requests: kube_api.ResourceList{
 							kube_api.ResourceCPU:    *resource.NewMilliQuantity(333, resource.DecimalSI),
