Rename google-containers to google_containers in image names

duda · Apr 1, 2015 · 5068875 · 5068875
1 parent fb1a821
commit 5068875
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: gcr.io/google-containers/heapster:v0.9
+            image: gcr.io/google_containers/heapster:v0.9
             env: 
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"

diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -15,14 +15,14 @@ desiredState:
         id: monitoring-influx-grafana
         containers: 
           - name: influxdb
-            image: gcr.io/google-containers/heapster_influxdb:v0.3
+            image: gcr.io/google_containers/heapster_influxdb:v0.3
             ports: 
               - containerPort: 8083
                 hostPort: 8083
               - containerPort: 8086
                 hostPort: 8086
           - name: grafana
-            image: gcr.io/google-containers/heapster_grafana:v0.5
+            image: gcr.io/google_containers/heapster_grafana:v0.5
             env: 
               - name: "HTTP_USER"
                 value: "admin"

diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google-containers/heapster:v0.9
+        - image: gcr.io/google_containers/heapster:v0.9
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"

diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -16,15 +16,15 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google-containers/heapster_influxdb:v0.3
+        - image: gcr.io/google_containers/heapster_influxdb:v0.3
           name: influxdb
           ports: 
             - containerPort: 8083
               hostPort: 8083
             - containerPort: 8086
               hostPort: 8086
         - name: grafana
-          image: gcr.io/google-containers/heapster_grafana:v0.5
+          image: gcr.io/google_containers/heapster_grafana:v0.5
           ports:
               - containerPort: 80
           env: 

diff --git a/cluster/addons/dns/kube2sky/Makefile b/cluster/addons/dns/kube2sky/Makefile
@@ -4,10 +4,10 @@ kube2sky: kube2sky.go
 	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
 
 container: kube2sky
-	sudo docker build -t kubernetes/kube2sky .
+	sudo docker build -t gcr.io/google_containers/kube2sky .
 
 push:
-	sudo docker push kubernetes/kube2sky
+	gcloud preview docker push gcr.io/google_containers/kube2sky
 
 clean:
 	rm -f kube2sky
diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
@@ -29,13 +29,13 @@ desiredState:
                     "-advertise-client-urls=http://127.0.0.1:4001",
             ]
           - name: kube2sky
-            image: gcr.io/google-containers/kube2sky:1.1
+            image: gcr.io/google_containers/kube2sky:1.1
             command: [
                     # entrypoint = "/kube2sky",
                     "-domain={{ pillar['dns_domain'] }}",
             ]
           - name: skydns
-            image: gcr.io/google-containers/skydns:2015-03-11-001
+            image: gcr.io/google_containers/skydns:2015-03-11-001
             command: [
                     # entrypoint = "/skydns",
                     "-machines=http://localhost:4001",

diff --git a/cluster/addons/dns/skydns/Makefile b/cluster/addons/dns/skydns/Makefile
@@ -4,10 +4,10 @@ skydns:
 	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
 
 container: skydns
-	sudo docker build -t kubernetes/skydns .
+	sudo docker build -t gcr.io/google_containers/skydns .
 
 push:
-	sudo docker push kubernetes/skydns
+	sudo gcloud preview docker push gcr.io/google_containers/skydns
 
 clean:
 	rm -f skydns
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -2,8 +2,8 @@
 
 TAG = 1.1
 
-build:	
-	docker build -t kubernetes/kibana:$(TAG) .
+build:
+	docker build -t gcr.io/google_containers/kibana:$(TAG) .
 
-push:	
-	docker push kubernetes/kibana:$(TAG)
+push:
+	gcloud preview docker push gcr.io/google_containers/kibana:$(TAG)
diff --git a/contrib/logging/fluentd-gcp-image/Makefile b/contrib/logging/fluentd-gcp-image/Makefile
@@ -8,9 +8,9 @@
 
 TAG = 1.2
 
-build:	
+build:
 	docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
 
-push:	
+push:
 	gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)