Convert registry to k8s.gcr.io

kubernetes · Feb 14, 2018 · 79d5f79 · 79d5f79
1 parent 6a05553
commit 79d5f79
Show file tree

Hide file tree

Showing 50 changed files with 96 additions and 96 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -55,7 +55,7 @@ container_pull(
     name = "debian_hyperkube_base_amd64",
     # 'tag' is also supported, but digest is encouraged for reproducibility.
     digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b",
-    registry = "gcr.io",
-    repository = "google_containers/debian-hyperkube-base-amd64",
+    registry = "k8s.gcr.io",
+    repository = "debian-hyperkube-base-amd64",
     tag = "0.8",
 )
diff --git a/addons/cluster-autoscaler/README.md b/addons/cluster-autoscaler/README.md
@@ -6,7 +6,7 @@ Note that you likely want to change `AWS_REGION` and `GROUP_NAME`, and probably
 
 ```bash
 CLOUD_PROVIDER=aws
-IMAGE=gcr.io/google_containers/cluster-autoscaler:v1.1.0
+IMAGE=k8s.gcr.io/cluster-autoscaler:v1.1.0
 MIN_NODES=1
 MAX_NODES=5
 AWS_REGION=us-east-1

diff --git a/addons/ingress-nginx/README.md b/addons/ingress-nginx/README.md
@@ -3,7 +3,7 @@
 ## Creating a simple ingress
 
 ```
-kubectl run echoheaders --image=gcr.io/google_containers/echoserver:1.4 --replicas=1 --port=8080
+kubectl run echoheaders --image=k8s.gcr.io/echoserver:1.4 --replicas=1 --port=8080
 kubectl expose deployment echoheaders --port=80 --target-port=8080 --name=echoheaders-x
 kubectl expose deployment echoheaders --port=80 --target-port=8080 --name=echoheaders-y
 

diff --git a/addons/ingress-nginx/v1.4.0.yaml b/addons/ingress-nginx/v1.4.0.yaml
@@ -30,7 +30,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: default-http-backend
-        image: gcr.io/google_containers/defaultbackend:1.0
+        image: k8s.gcr.io/defaultbackend:1.0
         livenessProbe:
           httpGet:
             path: /healthz
@@ -101,7 +101,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
+      - image: k8s.gcr.io/nginx-ingress-controller:0.8.3
         name: ingress-nginx
         imagePullPolicy: Always
         ports:

diff --git a/addons/ingress-nginx/v1.6.0-gce.yaml b/addons/ingress-nginx/v1.6.0-gce.yaml
@@ -194,7 +194,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: default-http-backend
-        image: gcr.io/google_containers/defaultbackend:1.3
+        image: k8s.gcr.io/defaultbackend:1.3
         livenessProbe:
           httpGet:
             path: /healthz
@@ -272,7 +272,7 @@ spec:
       terminationGracePeriodSeconds: 60
       serviceAccountName: nginx-ingress-controller
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10
+      - image: k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.10
         name: nginx-ingress-controller
         imagePullPolicy: Always
         ports:

diff --git a/addons/ingress-nginx/v1.6.0.yaml b/addons/ingress-nginx/v1.6.0.yaml
@@ -194,7 +194,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       - name: default-http-backend
-        image: gcr.io/google_containers/defaultbackend:1.3
+        image: k8s.gcr.io/defaultbackend:1.3
         livenessProbe:
           httpGet:
             path: /healthz
@@ -274,7 +274,7 @@ spec:
       terminationGracePeriodSeconds: 60
       serviceAccountName: nginx-ingress-controller
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
+      - image: k8s.gcr.io/nginx-ingress-controller:0.9.0
         name: nginx-ingress-controller
         imagePullPolicy: Always
         ports:

diff --git a/addons/kube-state-metrics/v1.0.1.yaml b/addons/kube-state-metrics/v1.0.1.yaml
@@ -76,7 +76,7 @@ spec:
             memory: 200Mi
             cpu: 200m
       - name: addon-resizer
-        image: gcr.io/google_containers/addon-resizer:1.0
+        image: k8s.gcr.io/addon-resizer:1.0
         resources:
           limits:
             cpu: 100m

diff --git a/addons/kube-state-metrics/v1.1.0-rc.0.yaml b/addons/kube-state-metrics/v1.1.0-rc.0.yaml
@@ -76,7 +76,7 @@ spec:
             memory: 200Mi
             cpu: 200m
       - name: addon-resizer
-        image: gcr.io/google_containers/addon-resizer:1.0
+        image: k8s.gcr.io/addon-resizer:1.0
         resources:
           limits:
             cpu: 100m

diff --git a/addons/kube-state-metrics/v1.1.0.yaml b/addons/kube-state-metrics/v1.1.0.yaml
@@ -76,7 +76,7 @@ spec:
             memory: 500Mi
             cpu: 300m
       - name: addon-resizer
-        image: gcr.io/google_containers/addon-resizer:1.8.1
+        image: k8s.gcr.io/addon-resizer:1.8.1
         resources:
           limits:
             cpu: 100m

diff --git a/addons/kubernetes-dashboard/v1.1.0.yaml b/addons/kubernetes-dashboard/v1.1.0.yaml
@@ -37,7 +37,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.1.0
         imagePullPolicy: Always
         ports:
         - name: http

diff --git a/addons/kubernetes-dashboard/v1.4.0.yaml b/addons/kubernetes-dashboard/v1.4.0.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.4.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/addons/kubernetes-dashboard/v1.5.0.yaml b/addons/kubernetes-dashboard/v1.5.0.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/addons/kubernetes-dashboard/v1.6.0.yaml b/addons/kubernetes-dashboard/v1.6.0.yaml
@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.0
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.6.1.yaml b/addons/kubernetes-dashboard/v1.6.1.yaml
@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.1
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.1
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.6.3.yaml b/addons/kubernetes-dashboard/v1.6.3.yaml
@@ -57,7 +57,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.7.0.yaml b/addons/kubernetes-dashboard/v1.7.0.yaml
@@ -90,7 +90,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.7.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.7.0
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.7.1.yaml b/addons/kubernetes-dashboard/v1.7.1.yaml
@@ -90,7 +90,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.7.1
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.7.1
         ports:
         - containerPort: 9090
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.8.0.yaml b/addons/kubernetes-dashboard/v1.8.0.yaml
@@ -110,7 +110,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.0
         ports:
         - containerPort: 8443
           protocol: TCP

diff --git a/addons/kubernetes-dashboard/v1.8.1.yaml b/addons/kubernetes-dashboard/v1.8.1.yaml
@@ -114,7 +114,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.1
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1
         ports:
         - containerPort: 8443
           protocol: TCP

diff --git a/addons/logging-elasticsearch/v1.5.0.yaml b/addons/logging-elasticsearch/v1.5.0.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: fluentd-es
-        image: gcr.io/google_containers/fluentd-elasticsearch:1.22
+        image: k8s.gcr.io/fluentd-elasticsearch:1.22
         command:
           - '/bin/sh'
           - '-c'
@@ -89,7 +89,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - image: gcr.io/google_containers/elasticsearch:v2.4.1-2
+      - image: k8s.gcr.io/elasticsearch:v2.4.1-2
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class
@@ -146,7 +146,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: gcr.io/google_containers/kibana:v4.6.1-1
+        image: k8s.gcr.io/kibana:v4.6.1-1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/addons/logging-elasticsearch/v1.6.0.yaml b/addons/logging-elasticsearch/v1.6.0.yaml
@@ -113,7 +113,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: gcr.io/google_containers/fluentd-elasticsearch:1.22
+        image: k8s.gcr.io/fluentd-elasticsearch:1.22
         command:
           - '/bin/sh'
           - '-c'
@@ -185,7 +185,7 @@ spec:
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      - image: gcr.io/google_containers/elasticsearch:v2.4.1-2
+      - image: k8s.gcr.io/elasticsearch:v2.4.1-2
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class
@@ -242,7 +242,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: gcr.io/google_containers/kibana:v4.6.1-1
+        image: k8s.gcr.io/kibana:v4.6.1-1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/addons/monitoring-standalone/v1.1.0.yaml b/addons/monitoring-standalone/v1.1.0.yaml
@@ -20,7 +20,7 @@ spec:
         version: v1.1.0
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.1.0
+        - image: k8s.gcr.io/heapster:v1.1.0
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -33,7 +33,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:1.3
+        - image: k8s.gcr.io/addon-resizer:1.3
           name: heapster-nanny
           resources:
             limits:

diff --git a/addons/monitoring-standalone/v1.2.0.yaml b/addons/monitoring-standalone/v1.2.0.yaml
@@ -24,7 +24,7 @@ spec:
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.2.0
+        - image: k8s.gcr.io/heapster:v1.2.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -44,7 +44,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:1.6
+        - image: k8s.gcr.io/addon-resizer:1.6
           name: heapster-nanny
           resources:
             limits:

diff --git a/addons/monitoring-standalone/v1.3.0.yaml b/addons/monitoring-standalone/v1.3.0.yaml
@@ -24,7 +24,7 @@ spec:
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v1.3.0
+        - image: k8s.gcr.io/heapster:v1.3.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -44,7 +44,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:1.7
+        - image: k8s.gcr.io/addon-resizer:1.7
           name: heapster-nanny
           resources:
             limits:

diff --git a/addons/monitoring-standalone/v1.6.0.yaml b/addons/monitoring-standalone/v1.6.0.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       serviceAccountName: heapster
       containers:
-        - image: gcr.io/google_containers/heapster:v1.3.0
+        - image: k8s.gcr.io/heapster:v1.3.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -45,7 +45,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:1.7
+        - image: k8s.gcr.io/addon-resizer:1.7
           name: heapster-nanny
           resources:
             limits:

diff --git a/addons/monitoring-standalone/v1.7.0.yaml b/addons/monitoring-standalone/v1.7.0.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       serviceAccountName: heapster
       containers:
-        - image: gcr.io/google_containers/heapster:v1.4.0
+        - image: k8s.gcr.io/heapster:v1.4.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -45,7 +45,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:2.0
+        - image: k8s.gcr.io/addon-resizer:2.0
           name: heapster-nanny
           resources:
             limits:

diff --git a/docs/advisories/cve_2017_14491.md b/docs/advisories/cve_2017_14491.md
@@ -83,7 +83,7 @@ Apply the update to the container:
 
 ```bash
 kubectl set image deployment/kube-dns -n kube-system \
- dnsmasq=gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+ dnsmasq=k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
 ```
 
 Validate the change was applied to the deployment:
@@ -108,8 +108,8 @@ You should see version 1.14.5 for the k8s-dns-dnsmasq-nanny-amd64 container:
 
 ```console
 NAME                        IMAGE
-kube-dns-1100866048-3lqm0   gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5,gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5,gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
-kube-dns-1100866048-tjlv2   gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5,gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5,gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+kube-dns-1100866048-3lqm0   k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5,k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5,k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
+kube-dns-1100866048-tjlv2   k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5,k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5,k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
 ```
 
 ### Kubernetes Versions 1.4.x - 1.5.x
@@ -136,7 +136,7 @@ Upgrade the kube-dns container to the new version.
 
 ```bash
 kubectl set image deployment/kube-dns -n kube-system \
- dnsmasq=gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ dnsmasq=k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5
 ```
 
 Validate the change was applied to the deployment:
@@ -157,8 +157,8 @@ You should see version 1.14.5 for the dnsmasq pod
 
 ```console
 NAME                        IMAGE
-kube-dns-4146767324-djthf   gcr.io/google_containers/kubedns-amd64:1.9,gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5,gcr.io/google_containers/dnsmasq-metrics-amd64:1.0,gcr.io/google_containers/exechealthz-amd64:1.2
-kube-dns-4146767324-kloxi   gcr.io/google_containers/kubedns-amd64:1.9,gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5,gcr.io/google_containers/dnsmasq-metrics-amd64:1.0,gcr.io/google_containers/exechealthz-amd64:1.2
+kube-dns-4146767324-djthf   k8s.gcr.io/kubedns-amd64:1.9,k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5,k8s.gcr.io/dnsmasq-metrics-amd64:1.0,k8s.gcr.io/exechealthz-amd64:1.2
+kube-dns-4146767324-kloxi   k8s.gcr.io/kubedns-amd64:1.9,k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5,k8s.gcr.io/dnsmasq-metrics-amd64:1.0,k8s.gcr.io/exechealthz-amd64:1.2
 ```
 
 ## More Information

diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/debian-base-amd64:0.3
+FROM k8s.gcr.io/debian-base-amd64:0.3
 
 # Install packages:
 #  curl (to download golang)