From f76c940d20b0e4ead376774612f4cd824117b489 Mon Sep 17 00:00:00 2001 From: PatrickLaabs Date: Mon, 9 Jun 2025 12:56:45 +0200 Subject: [PATCH] Adding Addon Provider for cdk8s/CAAPC to cluster-api --- cmd/clusterctl/client/config/providers_client.go | 6 ++++++ cmd/clusterctl/client/config_test.go | 2 ++ cmd/clusterctl/cmd/config_repositories_test.go | 5 +++++ docs/book/src/reference/providers.md | 1 + docs/release/role-handbooks/communications/README.md | 1 + 5 files changed, 15 insertions(+) diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go index 36d46f1a8347..bd422e45e780 100644 --- a/cmd/clusterctl/client/config/providers_client.go +++ b/cmd/clusterctl/client/config/providers_client.go @@ -106,6 +106,7 @@ const ( // Add-on providers. const ( + Cdk8sAddonProviderName = "eitco-cdk8s" HelmAddonProviderName = "helm" FleetAddonProviderName = "rancher-fleet" ) @@ -441,6 +442,11 @@ func (p *providersClient) defaults() []Provider { url: "https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/latest/addon-components.yaml", providerType: clusterctlv1.AddonProviderType, }, + &provider{ + name: Cdk8sAddonProviderName, + url: "https://github.com/eitco/cluster-api-addon-provider-cdk8s/releases/latest/addon-components.yaml", + providerType: clusterctlv1.AddonProviderType, + }, // Runtime extensions providers &provider{ diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go index 19b68d6d172d..0df757492d91 100644 --- a/cmd/clusterctl/client/config_test.go +++ b/cmd/clusterctl/client/config_test.go @@ -109,6 +109,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) { config.InClusterIPAMProviderName, config.NutanixIPAMProviderName, config.NutanixRuntimeExtensionsProviderName, + config.Cdk8sAddonProviderName, config.HelmAddonProviderName, config.FleetAddonProviderName, }, @@ -176,6 +177,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) { config.InClusterIPAMProviderName, config.NutanixIPAMProviderName, config.NutanixRuntimeExtensionsProviderName, + config.Cdk8sAddonProviderName, config.HelmAddonProviderName, config.FleetAddonProviderName, }, diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go index 085814cb73ef..1b5ecebefde1 100644 --- a/cmd/clusterctl/cmd/config_repositories_test.go +++ b/cmd/clusterctl/cmd/config_repositories_test.go @@ -155,6 +155,7 @@ vultr-vultr InfrastructureProvider https://github.com/vultr/clus in-cluster IPAMProvider https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/latest/ ipam-components.yaml 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 +eitco-cdk8s AddonProvider https://github.com/eitco/cluster-api-addon-provider-cdk8s/releases/latest/ addon-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 ` @@ -383,6 +384,10 @@ var expectedOutputYaml = `- File: core_components.yaml Name: nutanix ProviderType: RuntimeExtensionProvider URL: https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/latest/ +- File: addon-components.yaml + Name: eitco-cdk8s + ProviderType: AddonProvider + URL: https://github.com/eitco/cluster-api-addon-provider-cdk8s/releases/latest/ - File: addon-components.yaml Name: helm ProviderType: AddonProvider diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md index 5177525a4a06..40ca55533efd 100644 --- a/docs/book/src/reference/providers.md +++ b/docs/book/src/reference/providers.md @@ -78,6 +78,7 @@ source of inspiration and ideas for others. ## Addon - [Fleet](https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/) - [Helm](https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/) +- [Cdk8s](https://github.com/eitco/cluster-api-addon-provider-cdk8s/) ## Runtime Extensions - [Nutanix](https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/) diff --git a/docs/release/role-handbooks/communications/README.md b/docs/release/role-handbooks/communications/README.md index 828917fbb49f..194438fbd2f0 100644 --- a/docs/release/role-handbooks/communications/README.md +++ b/docs/release/role-handbooks/communications/README.md @@ -182,6 +182,7 @@ We should inform at least the following providers via a new issue on their respe * 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 +* Addon provider cdk8s: https://github.com/eitco/cluster-api-addon-provider-cdk8s/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 * Cloudstack: https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/new