From 70dd0c85993a50dc48e6bb5cc1015b182d64d798 Mon Sep 17 00:00:00 2001 From: "SPEARS, DUSTIN (ds443n)" Date: Tue, 18 Apr 2023 15:02:30 -0400 Subject: [PATCH] Remove deprecated controller-manager flag Additionally update all images from k8s.gcr.io to registry.k8s.io Change-Id: I0240ee0bf5d23d035126a81318f57b240f5af402 --- charts/apiserver-webhook/values.yaml | 2 +- charts/apiserver/values.yaml | 2 +- charts/controller_manager/values.yaml | 3 +-- charts/proxy/values.yaml | 2 +- charts/scheduler/values.yaml | 2 +- doc/source/configuration/genesis.rst | 6 +++--- doc/source/configuration/kubelet.rst | 2 +- examples/basic/Genesis.yaml | 6 +++--- examples/basic/Kubelet.yaml | 2 +- examples/basic/armada-resources.yaml | 8 ++++---- examples/complete/Genesis.yaml | 6 +++--- examples/complete/Kubelet.yaml | 2 +- examples/complete/armada-resources.yaml | 10 +++++----- examples/containerd/Genesis.yaml | 6 +++--- examples/containerd/Kubelet.yaml | 2 +- examples/containerd/armada-resources.yaml | 8 ++++---- examples/gate/Genesis.yaml | 6 +++--- examples/gate/Kubelet.yaml | 2 +- examples/gate/armada-resources.yaml | 8 ++++---- tests/unit/api/test_validatedesign.py | 8 ++++---- tests/unit/builder_data/simple/Genesis.yaml | 6 +++--- tests/unit/builder_data/simple/Kubelet.yaml | 2 +- tests/unit/builder_data/simple/armada-resources.yaml | 8 ++++---- tools/gate/config-templates/site-config.yaml | 2 +- tools/gate/default-config-env | 8 ++++---- tools/registry/IMAGES | 8 ++++---- 26 files changed, 63 insertions(+), 64 deletions(-) diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index 98625d1f..2367afd3 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -17,7 +17,7 @@ release_uuid: null images: tags: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 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 diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index 62925331..b7fc1915 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -59,7 +59,7 @@ images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 key_rotate: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal pull_policy: "IfNotPresent" local_registry: diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index bdcd72fe..27a97d71 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -17,7 +17,7 @@ release_group: null images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 pull_policy: "IfNotPresent" labels: @@ -52,7 +52,6 @@ command_prefix: - --cluster-cidr=10.97.0.0/16 - --node-monitor-period=5s - --node-monitor-grace-period=20s - - --pod-eviction-timeout=60s - --service-cluster-ip-range=10.96.0.0/16 - --terminated-pod-gc-threshold=1000 diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index ee36170a..bc5c12ca 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -68,7 +68,7 @@ pod: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 6025686c..c101c900 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -81,7 +81,7 @@ secrets: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index 3068ebd8..3f4d2a0c 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -42,10 +42,10 @@ Here is a complete sample document: images: armada: quay.io/airshipit/armada:latest kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "" diff --git a/doc/source/configuration/kubelet.rst b/doc/source/configuration/kubelet.rst index f6e4afcf..14d10c29 100644 --- 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: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 nodeStatusUpdateFrequency: "5s" diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index bdb8a7f8..3034f155 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/basic/Kubelet.yaml b/examples/basic/Kubelet.yaml index 4b4d6365..a299f606 100644 --- a/examples/basic/Kubelet.yaml +++ b/examples/basic/Kubelet.yaml @@ -13,7 +13,7 @@ data: - --container-runtime-endpoint=unix:///run/containerd/containerd.sock - --v=3 images: - pause: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 featureGates: {} diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 5b8e5836..7bda032d 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -735,7 +735,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -801,7 +801,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 secrets: service_account: private_key: placeholder @@ -875,7 +875,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 5d479330..cf13e6aa 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -35,10 +35,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/complete/Kubelet.yaml b/examples/complete/Kubelet.yaml index 66d3eefa..59a4e8ff 100644 --- a/examples/complete/Kubelet.yaml +++ b/examples/complete/Kubelet.yaml @@ -13,7 +13,7 @@ data: - --container-runtime-endpoint=unix:///run/containerd/containerd.sock - --v=3 images: - pause: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 nodeStatusUpdateFrequency: "5s" diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 62d28132..8e561395 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -200,7 +200,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -736,7 +736,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 secrets: service_account: public_key: placeholder @@ -813,7 +813,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 secrets: service_account: private_key: placeholder @@ -886,7 +886,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 source: type: local @@ -1665,7 +1665,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: k8s.gcr.io/defaultbackend:1.0 + error_pages: registry.k8s.io/defaultbackend:1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 source: type: git diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 26bc63b3..9f7d141e 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/containerd/Kubelet.yaml b/examples/containerd/Kubelet.yaml index 2d1b8f59..b1673ea6 100644 --- a/examples/containerd/Kubelet.yaml +++ b/examples/containerd/Kubelet.yaml @@ -13,7 +13,7 @@ data: - --container-runtime-endpoint=unix:///run/containerd/containerd.sock - --v=3 images: - pause: k8s.gcr.io/pause-amd64:3.0 + pause: registry.k8s.io/pause-amd64:3.0 config_file_overrides: runtimeRequestTimeout: 15m evictionMaxPodGracePeriod: -1 diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index d99bd38b..289e7c04 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -633,7 +633,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -699,7 +699,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 secrets: service_account: private_key: placeholder @@ -773,7 +773,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 26bc63b3..9f7d141e 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/gate/Kubelet.yaml b/examples/gate/Kubelet.yaml index 4b4d6365..a299f606 100644 --- a/examples/gate/Kubelet.yaml +++ b/examples/gate/Kubelet.yaml @@ -13,7 +13,7 @@ data: - --container-runtime-endpoint=unix:///run/containerd/containerd.sock - --v=3 images: - pause: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 featureGates: {} diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index e5cafc1e..b5a80143 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -639,7 +639,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -705,7 +705,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 secrets: service_account: private_key: placeholder @@ -779,7 +779,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 source: type: local diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 0a000389..0ca7410e 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -104,13 +104,13 @@ VALID_DOCS = [ 'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic', 'kubernetes': { 'apiserver': - 'k8s.gcr.io/kube-apiserver-amd64:v1.26.0', + 'registry.k8s.io/kube-apiserver-amd64:v1.26.0', 'controller-manager': - 'k8s.gcr.io/kube-controller-manager-amd64:v1.26.0', + 'registry.k8s.io/kube-controller-manager-amd64:v1.26.0', 'etcd': 'quay.io/coreos/etcd:v3.5.4', 'scheduler': - 'k8s.gcr.io/kube-scheduler-amd64:v1.26.0' + 'registry.k8s.io/kube-scheduler-amd64:v1.26.0' } }, 'ip': @@ -195,7 +195,7 @@ VALID_DOCS = [ 'data': { 'arguments': ['--v=5'], 'images': { - 'pause': 'k8s.gcr.io/pause-amd64:3.1' + 'pause': 'registry.k8s.io/pause-amd64:3.1' }, 'config_file_overrides': { 'evictionMaxPodGracePeriod': -1, diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 72f206f9..1916b6ec 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -32,10 +32,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/tests/unit/builder_data/simple/Kubelet.yaml b/tests/unit/builder_data/simple/Kubelet.yaml index 78aa09ff..a87800d4 100644 --- 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: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 nodeStatusUpdateFrequency: "5s" diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index a2093b06..b5233489 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0 + proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -635,7 +635,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0 secrets: service_account: public_key: placeholder @@ -712,7 +712,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0 secrets: service_account: private_key: placeholder @@ -785,7 +785,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0 source: type: local diff --git a/tools/gate/config-templates/site-config.yaml b/tools/gate/config-templates/site-config.yaml index 09e37ff9..e0856b39 100644 --- a/tools/gate/config-templates/site-config.yaml +++ b/tools/gate/config-templates/site-config.yaml @@ -159,7 +159,7 @@ data: arguments: - --v=5 images: - pause: k8s.gcr.io/pause-amd64:3.1 + pause: registry.k8s.io/pause-amd64:3.1 config_file_overrides: evictionMaxPodGracePeriod: -1 nodeStatusUpdateFrequency: "5s" diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 9d47d03d..baef7c2c 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,9 +8,9 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.5.4 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v3.9.4 -IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.26.0 -IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.26.0 -IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.26.0 -IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.26.0 +IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.26.0 +IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.26.0 +IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.26.0 +IMAGE_PROXY=registry.k8s.io/kube-proxy-amd64:v1.26.0 IMAGE_ANCHOR=quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal KUBELET_URL=https://dl.k8s.io/v1.26.0/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index bcc2a330..b51ee3bc 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,10 +1,10 @@ # source_name, tag, cache_name coredns/coredns,1.9.4,coredns quay.io/airshipit/porthole-compute-utility,master-ubuntu_focal,kubectl -k8s.gcr.io/kube-apiserver-amd64,v1.26.0,apiserver -k8s.gcr.io/kube-controller-manager-amd64,v1.26.0,controller-manager -k8s.gcr.io/kube-scheduler-amd64,v1.26.0,scheduler -k8s.gcr.io/kube-proxy-amd64,v1.26.0,proxy +registry.k8s.io/kube-apiserver-amd64,v1.26.0,apiserver +registry.k8s.io/kube-controller-manager-amd64,v1.26.0,controller-manager +registry.k8s.io/kube-scheduler-amd64,v1.26.0,scheduler +registry.k8s.io/kube-proxy-amd64,v1.26.0,proxy lachlanevenson/k8s-helm,v3.9.4,helm quay.io/airshipit/armada,master,armada quay.io/calico/cni,v3.4.0,calico-cni