diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml index 4c1f373564428..cf276947e090f 100644 --- 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 index dd80b4dcf251b..7dd85ef39839d 100644 --- 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 index fa7b3267e8881..a383d4e7404be 100644 --- 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 index 212122d72bd4b..d25f209c0c00f 100644 --- a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml +++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml @@ -16,7 +16,7 @@ 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 @@ -24,7 +24,7 @@ spec: - 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 index 69738b45976c6..998f64510650e 100644 --- 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 index de6e5a7c324f5..048785f973857 100644 --- 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 index 140d6a8cdd319..5179288182039 100644 --- 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 index 0cfc8b47e95d4..c658c7179ea8b 100755 --- 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 index 9cf8a0b158938..7fc9907d1765c 100644 --- 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)