Merge pull request #11226 from k8s-infra-cherrypick-robot/cherry-pick…

…-11216-to-release-1.7 [release-1.7] 🌱 Update RKE2 provider URL
kubernetes-sigs · Sep 25, 2024 · 6cf9d52 · 6cf9d52
2 parents f7ba022 + c2b7cfd
commit 6cf9d52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -342,7 +342,7 @@ func (p *providersClient) defaults() []Provider {
 		},
 		&provider{
 			name:         RKE2BootstrapProviderName,
-			url:          "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
+			url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
 			providerType: clusterctlv1.BootstrapProviderType,
 		},
 		&provider{
@@ -389,7 +389,7 @@ func (p *providersClient) defaults() []Provider {
 		},
 		&provider{
 			name:         RKE2ControlPlaneProviderName,
-			url:          "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/control-plane-components.yaml",
+			url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/latest/control-plane-components.yaml",
 			providerType: clusterctlv1.ControlPlaneProviderType,
 		},
 		&provider{

diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -110,7 +110,7 @@ kubeadm                 BootstrapProvider        https://github.com/kubernetes-s
 kubekey-k3s             BootstrapProvider        https://github.com/kubesphere/kubekey/releases/latest/                                      bootstrap-components.yaml
 microk8s                BootstrapProvider        https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/       bootstrap-components.yaml
 ocne                    BootstrapProvider        https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/                    bootstrap-components.yaml
-rke2                    BootstrapProvider        https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/               bootstrap-components.yaml
+rke2                    BootstrapProvider        https://github.com/rancher/cluster-api-provider-rke2/releases/latest/                       bootstrap-components.yaml
 talos                   BootstrapProvider        https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/         bootstrap-components.yaml
 k0sproject-k0smotron    ControlPlaneProvider     https://github.com/k0sproject/k0smotron/releases/latest/                                    control-plane-components.yaml
 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
 microk8s                ControlPlaneProvider     https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/   control-plane-components.yaml
 nested                  ControlPlaneProvider     https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/             control-plane-components.yaml
 ocne                    ControlPlaneProvider     https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/                    control-plane-components.yaml
-rke2                    ControlPlaneProvider     https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/               control-plane-components.yaml
+rke2                    ControlPlaneProvider     https://github.com/rancher/cluster-api-provider-rke2/releases/latest/                       control-plane-components.yaml
 talos                   ControlPlaneProvider     https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/     control-plane-components.yaml
 aws                     InfrastructureProvider                                                                                               my-aws-infrastructure-components.yaml
 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
 - File: bootstrap-components.yaml
   Name: rke2
   ProviderType: BootstrapProvider
-  URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
+  URL: https://github.com/rancher/cluster-api-provider-rke2/releases/latest/
 - File: bootstrap-components.yaml
   Name: talos
   ProviderType: BootstrapProvider
@@ -225,7 +225,7 @@ var expectedOutputYaml = `- File: core_components.yaml
 - File: control-plane-components.yaml
   Name: rke2
   ProviderType: ControlPlaneProvider
-  URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
+  URL: https://github.com/rancher/cluster-api-provider-rke2/releases/latest/
 - File: control-plane-components.yaml
   Name: talos
   ProviderType: ControlPlaneProvider