From 8c1e6144bce2dc640eb5fc6597c37d93d8ac9362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Mon, 6 Mar 2023 15:44:05 +0100 Subject: [PATCH] Replace k8s.gcr.io with registry.k8s.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- Makefile | 2 +- docs/book/src/topics/unstacked-etcd.md | 4 ++-- .../v1beta1/bases/cluster-with-kcp.yaml | 2 +- .../cluster-with-custom-disk-offering.yaml | 2 +- .../cluster-with-disk-offering.yaml | 2 +- .../cluster-with-shared-network-and-kubevip.yaml | 2 +- .../v1beta2/bases/cluster-with-kcp.yaml | 2 +- .../cluster-with-custom-disk-offering.yaml | 2 +- .../cluster-with-disk-offering.yaml | 2 +- .../upgrade-cp.yaml | 2 +- .../before.yaml | 2 +- .../cluster-with-shared-network-and-kubevip.yaml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8170ccf8..0ebdbe72 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ ETCD := $(TOOLS_BIN_DIR)/etcd STAGING_REGISTRY := gcr.io/k8s-staging-capi-cloudstack STAGING_BUCKET ?= artifacts.k8s-staging-capi-cloudstack.appspot.com BUCKET ?= $(STAGING_BUCKET) -PROD_REGISTRY ?= k8s.gcr.io/capi-cloudstack +PROD_REGISTRY ?= registry.k8s.io/capi-cloudstack REGISTRY ?= $(STAGING_REGISTRY) RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null) PULL_BASE_REF ?= $(RELEASE_TAG) diff --git a/docs/book/src/topics/unstacked-etcd.md b/docs/book/src/topics/unstacked-etcd.md index c16d53e8..fdae7b9c 100644 --- a/docs/book/src/topics/unstacked-etcd.md +++ b/docs/book/src/topics/unstacked-etcd.md @@ -20,7 +20,7 @@ The value should point to an empty directory on the node ```yaml kubeadmConfigSpec: clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io etcd: local: dataDir: /var/lib/etcddisk/etcd @@ -51,7 +51,7 @@ The value should point to an empty directory on the node ```yaml kubeadmConfigSpec: clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io etcd: external: endpoints: diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml index c4726072..48a34295 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml @@ -43,7 +43,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml index 93d93648..da04cc42 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-disk-offering/cluster-with-disk-offering.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-disk-offering/cluster-with-disk-offering.yaml index 93d93648..da04cc42 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-disk-offering/cluster-with-disk-offering.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-disk-offering/cluster-with-disk-offering.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml index 0d2667ec..315709f6 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml @@ -43,7 +43,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/bases/cluster-with-kcp.yaml index 01542391..124e1d64 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/bases/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/bases/cluster-with-kcp.yaml @@ -48,7 +48,7 @@ spec: kubeletExtraArgs: provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'" clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml index a1faf53e..b9ab7e1b 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'" clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml index a1faf53e..b9ab7e1b 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'" clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-after/upgrade-cp.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-after/upgrade-cp.yaml index 2d903569..4a779fb3 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-after/upgrade-cp.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-after/upgrade-cp.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-before/before.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-before/before.yaml index 2fd6fcf5..02743e38 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-before/before.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-before/before.yaml @@ -10,7 +10,7 @@ spec: kubeletExtraArgs: provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}' clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}' diff --git a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml index 25c7a39f..53c95dc9 100644 --- a/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml +++ b/test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml @@ -48,7 +48,7 @@ spec: kubeletExtraArgs: provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'" clusterConfiguration: - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io joinConfiguration: nodeRegistration: name: '{{ local_hostname }}'