Update to container image repo k8s.gcr.io

gcr.io/google_containers/ no longer contains some of the image versions we require, use the new location. Change-Id: I8f9a976a35ca632d785dd4d05f2a55713bde8c3e
2020-12-08 08:13:36 -06:00 · 2020-12-08 08:13:36 -06:00 · 630e504e3e
commit 630e504e3e
parent 5e70957f83
31 changed files with 92 additions and 97 deletions
--- a/charts/apiserver-webhook/values.yaml
+++ b/charts/apiserver-webhook/values.yaml
@ -17,7 +17,7 @@ release_uuid: null

 images:
  tags:
-    apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
    scripted_test: docker.io/openstackhelm/heat:newton
    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@ -57,9 +57,9 @@ const:
 images:
  tags:
    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-    apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-    key_rotate: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+    apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+    key_rotate: k8s.gcr.io/hyperkube-amd64:v1.18.6
  pull_policy: "IfNotPresent"
  local_registry:
    active: false
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@ -16,8 +16,8 @@ release_group: null

 images:
  tags:
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-    controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+    controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
  pull_policy: "IfNotPresent"

 labels:
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@ -64,7 +64,7 @@ conf:

 images:
  tags:
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
    haproxy: haproxy:1.8.25
    test: python:3.6
  pull_policy: "IfNotPresent"
--- a/charts/promenade/values.yaml
+++ b/charts/promenade/values.yaml
@ -49,7 +49,7 @@ conf:
 images:
  tags:
    monitoring_image: busybox:1.28.3
-    hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    hyperkube: k8s.gcr.io/hyperkube-amd64:v1.18.6
    promenade: quay.io/airshipit/promenade:latest
    ks_user: docker.io/openstackhelm/heat:newton
    ks_service: docker.io/openstackhelm/heat:newton
--- a/charts/proxy/values.yaml
+++ b/charts/proxy/values.yaml
@ -67,7 +67,7 @@ pod:

 images:
  tags:
-    proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
  pull_policy: "IfNotPresent"

 proxy:
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@ -85,8 +85,8 @@ secrets:

 images:
  tags:
-    anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-    scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+    anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+    scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  pull_policy: "IfNotPresent"

 network:
--- a/doc/source/configuration/genesis.rst
+++ b/doc/source/configuration/genesis.rst
@ -48,10 +48,10 @@ Here is a complete sample document:
        helm:
          tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
        kubernetes:
-          apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-          controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+          apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+          controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
          etcd: quay.io/coreos/etcd:v3.4.3
-          scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+          scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
      files:
        - path: /var/lib/anchor/calico-etcd-bootstrap
          content: ""
--- a/doc/source/configuration/host-system.rst
+++ b/doc/source/configuration/host-system.rst
@ -24,7 +24,7 @@ Sample Document to run containers in Docker runtime
        helm:
          helm: lachlanevenson/k8s-helm:v2.14.0
        kubernetes:
-          kubectl: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+          kubectl: k8s.gcr.io/hyperkube-amd64:v1.18.6
      packages:
        repositories:
          - deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable
@ -124,7 +124,7 @@ Sample Document to run containers in Containerd runtime
        helm:
          helm: lachlanevenson/k8s-helm:v2.14.0
        kubernetes:
-          kubectl: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+          kubectl: k8s.gcr.io/hyperkube-amd64:v1.18.6
      packages:
        additional:
          - curl
--- a/doc/source/configuration/kubelet.rst
+++ b/doc/source/configuration/kubelet.rst
@ -33,7 +33,7 @@ Here is a sample document:
        - --network-plugin=cni
        - --v=5
      images:
-        pause: gcr.io/google_containers/pause-amd64:3.1
+        pause: k8s.gcr.io/pause-amd64:3.1
      config_file_overrides:
        evictionMaxPodGracePeriod: -1
        nodeStatusUpdateFrequency: "5s"
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@ -51,10 +51,10 @@ data:
    helm:
      tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
    kubernetes:
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+      controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
      etcd: quay.io/coreos/etcd:v3.4.3
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  files:
    - path: /var/lib/anchor/calico-etcd-bootstrap
      content: "# placeholder for triggering calico etcd bootstrapping"
--- a/examples/basic/Kubelet.yaml
+++ b/examples/basic/Kubelet.yaml
@ -14,7 +14,7 @@ data:
    - --network-plugin=cni
    - --v=3
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.1
+    pause: k8s.gcr.io/pause-amd64:3.1
  config_file_overrides:
    evictionMaxPodGracePeriod: -1
    featureGates:
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@ -160,7 +160,7 @@ data:
  values:
    images:
      tags:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_netloc: 127.0.0.1:6553
  source:
@ -627,7 +627,7 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
        haproxy: haproxy:1.8.3
        test: python:3.6

@ -728,8 +728,8 @@ data:
        endpoints: https://127.0.0.1:2378
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_service_ip: 10.96.0.1
      pod_cidr: 10.97.0.0/16
@ -794,8 +794,8 @@ data:
  values:
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        private_key: placeholder
@ -868,8 +868,8 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6

  source:
    type: local
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@ -39,10 +39,10 @@ data:
    helm:
      tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
    kubernetes:
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+      controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
      etcd: quay.io/coreos/etcd:v3.4.3
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  files:
    - path: /var/lib/anchor/calico-etcd-bootstrap
      content: "# placeholder for triggering calico etcd bootstrapping"
--- a/examples/complete/Kubelet.yaml
+++ b/examples/complete/Kubelet.yaml
@ -14,7 +14,7 @@ data:
    - --network-plugin=cni
    - --v=5
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.1
+    pause: k8s.gcr.io/pause-amd64:3.1
  config_file_overrides:
    evictionMaxPodGracePeriod: -1
    nodeStatusUpdateFrequency: "5s"
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@ -201,7 +201,7 @@ data:
  values:
    images:
      tags:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_netloc: 127.0.0.1:6553
  source:
@ -644,7 +644,7 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
        haproxy: haproxy:1.8.3
        test: python:3.6

@ -730,8 +730,8 @@ data:
        endpoints: https://127.0.0.1:2378
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        public_key: placeholder
@ -807,8 +807,8 @@ data:
  values:
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        private_key: placeholder
@ -880,8 +880,8 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6

  source:
    type: local
@ -1660,7 +1660,7 @@ data:
        entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
        # https://github.com/kubernetes/ingress-nginx/blob/09524cd3363693463da5bf4a9bb3900da435ad05/Changelog.md#090
        ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
-        error_pages: gcr.io/google_containers/defaultbackend:1.0
+        error_pages: k8s.gcr.io/defaultbackend:1.0
        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
  source:
    type: git
--- a/examples/containerd/Genesis.yaml
+++ b/examples/containerd/Genesis.yaml
@ -51,10 +51,10 @@ data:
    helm:
      tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
    kubernetes:
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+      controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
      etcd: quay.io/coreos/etcd:v3.4.3
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  files:
    - path: /var/lib/anchor/calico-etcd-bootstrap
      content: "# placeholder for triggering calico etcd bootstrapping"
--- a/examples/containerd/Kubelet.yaml
+++ b/examples/containerd/Kubelet.yaml
@ -16,7 +16,7 @@ data:
    - --network-plugin=cni
    - --v=3
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.0
+    pause: k8s.gcr.io/pause-amd64:3.0
  config_file_overrides:
    runtimeRequestTimeout: 15m
    evictionMaxPodGracePeriod: -1
--- a/examples/containerd/armada-resources.yaml
+++ b/examples/containerd/armada-resources.yaml
@ -160,7 +160,7 @@ data:
  values:
    images:
      tags:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_netloc: 127.0.0.1:6553
  source:
@ -524,7 +524,7 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
        haproxy: haproxy:1.8.3
        test: python:3.6

@ -626,8 +626,8 @@ data:
        endpoints: https://127.0.0.1:2378
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_service_ip: 10.96.0.1
      pod_cidr: 10.97.0.0/16
@ -692,8 +692,8 @@ data:
  values:
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        private_key: placeholder
@ -766,8 +766,8 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6

  source:
    type: local
--- a/examples/gate/Genesis.yaml
+++ b/examples/gate/Genesis.yaml
@ -51,10 +51,10 @@ data:
    helm:
      tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
    kubernetes:
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+      controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
      etcd: quay.io/coreos/etcd:v3.4.3
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  files:
    - path: /var/lib/anchor/calico-etcd-bootstrap
      content: "# placeholder for triggering calico etcd bootstrapping"
--- a/examples/gate/Kubelet.yaml
+++ b/examples/gate/Kubelet.yaml
@ -14,7 +14,7 @@ data:
    - --network-plugin=cni
    - --v=3
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.1
+    pause: k8s.gcr.io/pause-amd64:3.1
  config_file_overrides:
    evictionMaxPodGracePeriod: -1
    featureGates:
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@ -160,7 +160,7 @@ data:
  values:
    images:
      tags:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_netloc: 127.0.0.1:6553
  source:
@ -530,7 +530,7 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
        haproxy: haproxy:1.8.3
        test: python:3.6

@ -632,8 +632,8 @@ data:
        endpoints: https://127.0.0.1:2378
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_service_ip: 10.96.0.1
      pod_cidr: 10.97.0.0/16
@ -698,8 +698,8 @@ data:
  values:
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        private_key: placeholder
@ -772,8 +772,8 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6

  source:
    type: local
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@ -106,14 +106,10 @@ VALID_DOCS = [
                    'tiller': 'gcr.io/kubernetes-helm/tiller:v2.16.1'
                },
                'kubernetes': {
-                    'apiserver':
-                    'gcr.io/google_containers/hyperkube-amd64:v1.18.6',
-                    'controller-manager':
-                    'gcr.io/google_containers/hyperkube-amd64:v1.18.6',
-                    'etcd':
-                    'quay.io/coreos/etcd:v3.4.3',
-                    'scheduler':
-                    'gcr.io/google_containers/hyperkube-amd64:v1.18.6'
+                    'apiserver': 'k8s.gcr.io/hyperkube-amd64:v1.18.6',
+                    'controller-manager': 'k8s.gcr.io/hyperkube-amd64:v1.18.6',
+                    'etcd': 'quay.io/coreos/etcd:v3.4.3',
+                    'scheduler': 'k8s.gcr.io/hyperkube-amd64:v1.18.6'
                }
            },
            'ip':
@ -165,8 +161,7 @@ VALID_DOCS = [
                    'helm': 'lachlanevenson/k8s-helm:v2.14.0'
                },
                'kubernetes': {
-                    'kubectl':
-                    'gcr.io/google_containers/hyperkube-amd64:v1.18.6'
+                    'kubectl': 'k8s.gcr.io/hyperkube-amd64:v1.18.6'
                }
            },
            'packages': {
@ -205,7 +200,7 @@ VALID_DOCS = [
                '--network-plugin=cni', '--v=5'
            ],
            'images': {
-                'pause': 'gcr.io/google_containers/pause-amd64:3.1'
+                'pause': 'k8s.gcr.io/pause-amd64:3.1'
            },
            'config_file_overrides': {
                'evictionMaxPodGracePeriod': -1,
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@ -36,10 +36,10 @@ data:
    helm:
      tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
    kubernetes:
-      apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-      controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
+      controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
      etcd: quay.io/coreos/etcd:v3.4.3
-      scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+      scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6
  files:
    - path: /var/lib/anchor/calico-etcd-bootstrap
      content: "# placeholder for triggering calico etcd bootstrapping"
--- a/tests/unit/builder_data/simple/Kubelet.yaml
+++ b/tests/unit/builder_data/simple/Kubelet.yaml
@ -14,7 +14,7 @@ data:
    - --network-plugin=cni
    - --v=5
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.1
+    pause: k8s.gcr.io/pause-amd64:3.1
  config_file_overrides:
    evictionMaxPodGracePeriod: -1
    nodeStatusUpdateFrequency: "5s"
--- a/tests/unit/builder_data/simple/armada-resources.yaml
+++ b/tests/unit/builder_data/simple/armada-resources.yaml
@ -161,7 +161,7 @@ data:
  values:
    images:
      tags:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6
    network:
      kubernetes_netloc: 127.0.0.1:6553
  source:
@ -537,7 +537,7 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
        haproxy: haproxy:1.8.3
        test: python:3.6

@ -629,8 +629,8 @@ data:
        endpoints: https://127.0.0.1:2378
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        public_key: placeholder
@ -706,8 +706,8 @@ data:
  values:
    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6
    secrets:
      service_account:
        private_key: placeholder
@ -779,8 +779,8 @@ data:

    images:
      tags:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.18.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.18.6
+        anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6
+        scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6

  source:
    type: local
--- a/tools/g2/lib/config.sh
+++ b/tools/g2/lib/config.sh
@ -3,7 +3,7 @@ export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-344784896}
 export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img}
 export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
 export IMAGE_PROMENADE_DISTRO=${IMAGE_PROMENADE_DISTRO:-ubuntu_bionic}
-export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.18.6}
+export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-k8s.gcr.io/hyperkube-amd64:v1.18.6}
 export NGINX_DIR="${TEMP_DIR}/nginx"
 export NGINX_URL="http://192.168.77.1:7777"
 export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local"
--- a/tools/gate/config-templates/site-config.yaml
+++ b/tools/gate/config-templates/site-config.yaml
@ -165,7 +165,7 @@ data:
    - --network-plugin=cni
    - --v=5
  images:
-    pause: gcr.io/google_containers/pause-amd64:3.1
+    pause: k8s.gcr.io/pause-amd64:3.1
  config_file_overrides:
    evictionMaxPodGracePeriod: -1
    nodeStatusUpdateFrequency: "5s"
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@ -8,6 +8,6 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.3
 IMAGE_HAPROXY=haproxy:1.8.3
 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0
-IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.18.6
+IMAGE_HYPERKUBE=k8s.gcr.io/hyperkube-amd64:v1.18.6
 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1
 KUBELET_URL=https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz
--- a/tools/registry/IMAGES
+++ b/tools/registry/IMAGES
@ -1,9 +1,9 @@
 # source_name, tag, cache_name
 coredns/coredns,0.9.9,coredns
-gcr.io/google_containers/hyperkube-amd64,v1.18.6,hyperkube
-gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
-gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
-gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
+k8s.gcr.io/hyperkube-amd64,v1.18.6,hyperkube
+k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
+k8s.gcr.io/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
+k8s.gcr.io/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
 gcr.io/kubernetes-helm/tiller,v2.14.0,tiller
 lachlanevenson/k8s-helm,v2.14.0,helm
 quay.io/airshipit/armada,master,armada
--- a/tools/simple-deployment.sh
+++ b/tools/simple-deployment.sh
@ -3,7 +3,7 @@
 set -eux

 IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
-IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.18.6}
+IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-k8s.gcr.io/hyperkube-amd64:v1.18.6}
 PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}

 SCRIPT_DIR=$(realpath $(dirname $0))