Skip to content

Commit 6cf9d52

Browse files
authored
Merge pull request #11226 from k8s-infra-cherrypick-robot/cherry-pick-11216-to-release-1.7
[release-1.7] 🌱 Update RKE2 provider URL
2 parents f7ba022 + c2b7cfd commit 6cf9d52

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cmd/clusterctl/client/config/providers_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ func (p *providersClient) defaults() []Provider {
342342
},
343343
&provider{
344344
name: RKE2BootstrapProviderName,
345-
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
345+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
346346
providerType: clusterctlv1.BootstrapProviderType,
347347
},
348348
&provider{
@@ -389,7 +389,7 @@ func (p *providersClient) defaults() []Provider {
389389
},
390390
&provider{
391391
name: RKE2ControlPlaneProviderName,
392-
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/control-plane-components.yaml",
392+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/latest/control-plane-components.yaml",
393393
providerType: clusterctlv1.ControlPlaneProviderType,
394394
},
395395
&provider{

cmd/clusterctl/cmd/config_repositories_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ kubeadm BootstrapProvider https://github.com/kubernetes-s
110110
kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubekey/releases/latest/ bootstrap-components.yaml
111111
microk8s BootstrapProvider https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/ bootstrap-components.yaml
112112
ocne BootstrapProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ bootstrap-components.yaml
113-
rke2 BootstrapProvider https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/ bootstrap-components.yaml
113+
rke2 BootstrapProvider https://github.com/rancher/cluster-api-provider-rke2/releases/latest/ bootstrap-components.yaml
114114
talos BootstrapProvider https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml
115115
k0sproject-k0smotron ControlPlaneProvider https://github.com/k0sproject/k0smotron/releases/latest/ control-plane-components.yaml
116116
kamaji ControlPlaneProvider https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/ control-plane-components.yaml
@@ -119,7 +119,7 @@ kubekey-k3s ControlPlaneProvider https://github.com/kubesphere/k
119119
microk8s ControlPlaneProvider https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/ control-plane-components.yaml
120120
nested ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ control-plane-components.yaml
121121
ocne ControlPlaneProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ control-plane-components.yaml
122-
rke2 ControlPlaneProvider https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/ control-plane-components.yaml
122+
rke2 ControlPlaneProvider https://github.com/rancher/cluster-api-provider-rke2/releases/latest/ control-plane-components.yaml
123123
talos ControlPlaneProvider https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/ control-plane-components.yaml
124124
aws InfrastructureProvider my-aws-infrastructure-components.yaml
125125
azure InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/latest/ infrastructure-components.yaml
@@ -189,7 +189,7 @@ var expectedOutputYaml = `- File: core_components.yaml
189189
- File: bootstrap-components.yaml
190190
Name: rke2
191191
ProviderType: BootstrapProvider
192-
URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
192+
URL: https://github.com/rancher/cluster-api-provider-rke2/releases/latest/
193193
- File: bootstrap-components.yaml
194194
Name: talos
195195
ProviderType: BootstrapProvider
@@ -225,7 +225,7 @@ var expectedOutputYaml = `- File: core_components.yaml
225225
- File: control-plane-components.yaml
226226
Name: rke2
227227
ProviderType: ControlPlaneProvider
228-
URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
228+
URL: https://github.com/rancher/cluster-api-provider-rke2/releases/latest/
229229
- File: control-plane-components.yaml
230230
Name: talos
231231
ProviderType: ControlPlaneProvider

0 commit comments

Comments
 (0)