Revert k8s.gcr.io vanity domain

This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526

cluster/addons/fluentd-elasticsearch/es-image/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	binary build push
 
-PREFIX = k8s.gcr.io
+PREFIX = gcr.io/google-containers
 IMAGE = elasticsearch
 TAG = v5.6.4
 

cluster/addons/fluentd-elasticsearch/es-statefulset.yaml

@@ -73,7 +73,7 @@ spec:
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      - image: k8s.gcr.io/elasticsearch:v5.6.4
+      - image: gcr.io/google-containers/elasticsearch:v5.6.4
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class

cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml

@@ -75,7 +75,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: k8s.gcr.io/fluentd-elasticsearch:v2.0.2
+        image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.2
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	build push
 
-PREFIX = k8s.gcr.io
+PREFIX = gcr.io/google-containers
 IMAGE = fluentd-elasticsearch
 TAG = v2.0.2
 

cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md

@@ -4,11 +4,11 @@ that collects Docker container log files using [Fluentd][fluentd]
 and sends them to an instance of [Elasticsearch][elasticsearch].
 This image is designed to be used as part of the [Kubernetes][kubernetes]
 cluster bring up process. The image resides at GCR under the name
-[k8s.gcr.io/fluentd-elasticsearch][image].
+[gcr.io/google-containers/fluentd-elasticsearch][image].
 
 [fluentd]: http://www.fluentd.org/
 [elasticsearch]: https://www.elastic.co/products/elasticsearch
 [kubernetes]: https://kubernetes.io
-[image]: https://k8s.gcr.io/fluentd-elasticsearch
+[image]: https://gcr.io/google-containers/fluentd-elasticsearch
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]()