Skip to content

Commit 95ff824

Browse files
Merge pull request #224 from xmudrii/registry-k8s-io
Replace k8s.gcr.io with registry.k8s.io
2 parents 98827c6 + 8c1e614 commit 95ff824

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ETCD := $(TOOLS_BIN_DIR)/etcd
4141
STAGING_REGISTRY := gcr.io/k8s-staging-capi-cloudstack
4242
STAGING_BUCKET ?= artifacts.k8s-staging-capi-cloudstack.appspot.com
4343
BUCKET ?= $(STAGING_BUCKET)
44-
PROD_REGISTRY ?= k8s.gcr.io/capi-cloudstack
44+
PROD_REGISTRY ?= registry.k8s.io/capi-cloudstack
4545
REGISTRY ?= $(STAGING_REGISTRY)
4646
RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null)
4747
PULL_BASE_REF ?= $(RELEASE_TAG)

docs/book/src/topics/unstacked-etcd.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The value should point to an empty directory on the node
2020
```yaml
2121
kubeadmConfigSpec:
2222
clusterConfiguration:
23-
imageRepository: k8s.gcr.io
23+
imageRepository: registry.k8s.io
2424
etcd:
2525
local:
2626
dataDir: /var/lib/etcddisk/etcd
@@ -51,7 +51,7 @@ The value should point to an empty directory on the node
5151
```yaml
5252
kubeadmConfigSpec:
5353
clusterConfiguration:
54-
imageRepository: k8s.gcr.io
54+
imageRepository: registry.k8s.io
5555
etcd:
5656
external:
5757
endpoints:

test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
kubeletExtraArgs:
4444
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
4545
clusterConfiguration:
46-
imageRepository: k8s.gcr.io
46+
imageRepository: registry.k8s.io
4747
joinConfiguration:
4848
nodeRegistration:
4949
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
kubeletExtraArgs:
1111
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
1212
clusterConfiguration:
13-
imageRepository: k8s.gcr.io
13+
imageRepository: registry.k8s.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-disk-offering/cluster-with-disk-offering.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
kubeletExtraArgs:
1111
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
1212
clusterConfiguration:
13-
imageRepository: k8s.gcr.io
13+
imageRepository: registry.k8s.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
kubeletExtraArgs:
4444
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
4545
clusterConfiguration:
46-
imageRepository: k8s.gcr.io
46+
imageRepository: registry.k8s.io
4747
joinConfiguration:
4848
nodeRegistration:
4949
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/bases/cluster-with-kcp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
kubeletExtraArgs:
4949
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
5050
clusterConfiguration:
51-
imageRepository: k8s.gcr.io
51+
imageRepository: registry.k8s.io
5252
joinConfiguration:
5353
nodeRegistration:
5454
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-custom-disk-offering/cluster-with-custom-disk-offering.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
kubeletExtraArgs:
1111
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
clusterConfiguration:
13-
imageRepository: k8s.gcr.io
13+
imageRepository: registry.k8s.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
kubeletExtraArgs:
1111
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
clusterConfiguration:
13-
imageRepository: k8s.gcr.io
13+
imageRepository: registry.k8s.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-after/upgrade-cp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
kubeletExtraArgs:
1111
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
1212
clusterConfiguration:
13-
imageRepository: k8s.gcr.io
13+
imageRepository: registry.k8s.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

0 commit comments

Comments
 (0)