Skip to content

Commit 5685e99

Browse files
committed
e2e: set imageRepository to ""
The image repository has been changed to registry.k8s.io by commit 8c1e614 However, with registry.k8s.io, the control plane vm cannot be booted to Ready state due to error below ``` ubuntu@disk-offering-gzojvb-control-plane-gwbnt:~$ tail -f /var/log/cloud-init-output.log [2023-05-08 11:09:23] [preflight] You can also perform this action in beforehand using 'kubeadm config images pull' [2023-05-08 11:09:28] error execution phase preflight: [preflight] Some fatal errors occurred: [2023-05-08 11:09:28] [ERROR ImagePull]: failed to pull image registry.k8s.io/coredns:v1.8.4: output: time="2023-05-08T11:09:28Z" level=fatal msg="pulling image: rpc error: code = NotFound desc = failed to pull and unpack image \"registry.k8s.io/coredns:v1.8.4\": failed to resolve reference \"registry.k8s.io/coredns:v1.8.4\": registry.k8s.io/coredns:v1.8.4: not found" [2023-05-08 11:09:28] , error: exit status 1 ``` this is same as kubernetes/kubeadm#2761 The new registry should be supported in k8s 1.25+. However, we still use 1.22/1.23/1.24 templates, so we need to use k8s.gcr.io setting the image respository to "" so that capi/kubeadm will determine the default repository by kubernetes version.
1 parent 1202d41 commit 5685e99

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

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: registry.k8s.io
46+
imageRepository: ""
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: registry.k8s.io
13+
imageRepository: ""
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: registry.k8s.io
13+
imageRepository: ""
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: registry.k8s.io
46+
imageRepository: ""
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: registry.k8s.io
51+
imageRepository: ""
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: registry.k8s.io
13+
imageRepository: ""
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: registry.k8s.io
13+
imageRepository: ""
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: registry.k8s.io
13+
imageRepository: ""
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-kubernetes-version-upgrade-before/before.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: registry.k8s.io
13+
imageRepository: ""
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'

test/e2e/data/infrastructure-cloudstack/v1beta2/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
@@ -48,7 +48,7 @@ spec:
4848
kubeletExtraArgs:
4949
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
5050
clusterConfiguration:
51-
imageRepository: registry.k8s.io
51+
imageRepository: ""
5252
joinConfiguration:
5353
nodeRegistration:
5454
name: '{{ local_hostname }}'

0 commit comments

Comments
 (0)