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

…-11806-to-release-1.9
kubernetes-sigs · Feb 11, 2025 · 8df2e07 · 8df2e07
2 parents c3df07c + b98ed8c
commit 8df2e07
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -108,7 +108,8 @@ const (
 
 // Add-on providers.
 const (
-	HelmAddonProviderName = "helm"
+	HelmAddonProviderName  = "helm"
+	FleetAddonProviderName = "rancher-fleet"
 )
 
 // Runtime extensions providers.
@@ -442,6 +443,11 @@ func (p *providersClient) defaults() []Provider {
 		},
 
 		// Add-on providers
+		&provider{
+			name:         FleetAddonProviderName,
+			url:          "https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/releases/latest/addon-components.yaml",
+			providerType: clusterctlv1.AddonProviderType,
+		},
 		&provider{
 			name:         HelmAddonProviderName,
 			url:          "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/addon-components.yaml",

diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
@@ -113,6 +113,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.NutanixIPAMProviderName,
 				config.NutanixRuntimeExtensionsProviderName,
 				config.HelmAddonProviderName,
+				config.FleetAddonProviderName,
 			},
 			wantErr: false,
 		},
@@ -181,6 +182,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.NutanixIPAMProviderName,
 				config.NutanixRuntimeExtensionsProviderName,
 				config.HelmAddonProviderName,
+				config.FleetAddonProviderName,
 			},
 			wantErr: false,
 		},

diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -161,6 +161,7 @@ in-cluster              IPAMProvider               https://github.com/kubernetes
 nutanix                 IPAMProvider               https://github.com/nutanix-cloud-native/cluster-api-ipam-provider-nutanix/releases/latest/        ipam-components.yaml
 nutanix                 RuntimeExtensionProvider   https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/latest/   runtime-extensions-components.yaml
 helm                    AddonProvider              https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/               addon-components.yaml
+rancher-fleet           AddonProvider              https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/releases/latest/              addon-components.yaml
 `
 
 var expectedOutputYaml = `- File: core_components.yaml
@@ -399,4 +400,8 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: helm
   ProviderType: AddonProvider
   URL: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/
+- File: addon-components.yaml
+  Name: rancher-fleet
+  ProviderType: AddonProvider
+  URL: https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/releases/latest/
 `
diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md
@@ -68,6 +68,7 @@ updated info about which API version they are supporting.
 - [Nutanix](https://github.com/nutanix-cloud-native/cluster-api-ipam-provider-nutanix)
 
 ## Addon
+- [Fleet](https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/)
 - [Helm](https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/)
 
 ## Runtime Extensions

diff --git a/docs/release/role-handbooks/communications/README.md b/docs/release/role-handbooks/communications/README.md
@@ -180,6 +180,7 @@ The goal of this task is to inform all providers that a new beta.0 version a rel
 
 We should inform at least the following providers via a new issue on their respective repos that a new version of CAPI is being released (provide the release date) and that the beta.0 version is ready for them to test.
 
+* Addon provider fleet: https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/issues/new
 * Addon provider helm: https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/issues/new
 * AWS: https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/new
 * Azure: https://github.com/kubernetes-sigs/cluster-api-provider-azure/issues/new