Merge pull request #9403 from aamoyel/doc-kamaji-cp-provider

📖 documentation: new Kamaji cp provider
kubernetes-sigs · Sep 14, 2023 · 818da4f · 818da4f
2 parents c4e2d67 + 7eefd83
commit 818da4f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -82,6 +82,7 @@ const (
 	NestedControlPlaneProviderName            = "nested"
 	OracleCloudNativeControlPlaneProviderName = "ocne"
 	KubeKeyK3sControlPlaneProviderName        = "kubekey-k3s"
+	KamajiControlPlaneProviderName            = "kamaji"
 )
 
 // Add-on providers.
@@ -326,6 +327,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/control-plane-components.yaml",
 			providerType: clusterctlv1.ControlPlaneProviderType,
 		},
+		&provider{
+			name:         KamajiControlPlaneProviderName,
+			url:          "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/control-plane-components.yaml",
+			providerType: clusterctlv1.ControlPlaneProviderType,
+		},
 
 		// Add-on providers
 		&provider{

diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
@@ -62,6 +62,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MicroK8sBootstrapProviderName,
 				config.OracleCloudNativeBootstrapProviderName,
 				config.TalosBootstrapProviderName,
+				config.KamajiControlPlaneProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.KubeKeyK3sControlPlaneProviderName,
 				config.MicroK8sControlPlaneProviderName,
@@ -112,6 +113,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MicroK8sBootstrapProviderName,
 				config.OracleCloudNativeBootstrapProviderName,
 				config.TalosBootstrapProviderName,
+				config.KamajiControlPlaneProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.KubeKeyK3sControlPlaneProviderName,
 				config.MicroK8sControlPlaneProviderName,

diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -110,6 +110,7 @@ kubekey-k3s         BootstrapProvider        https://github.com/kubesphere/kubek
 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
 talos               BootstrapProvider        https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/         bootstrap-components.yaml
+kamaji              ControlPlaneProvider     https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/       control-plane-components.yaml
 kubeadm             ControlPlaneProvider     https://github.com/kubernetes-sigs/cluster-api/releases/latest/                             control-plane-components.yaml
 kubekey-k3s         ControlPlaneProvider     https://github.com/kubesphere/kubekey/releases/latest/                                      control-plane-components.yaml
 microk8s            ControlPlaneProvider     https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/   control-plane-components.yaml
@@ -174,6 +175,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: talos
   ProviderType: BootstrapProvider
   URL: https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/
+- File: control-plane-components.yaml
+  Name: kamaji
+  ProviderType: ControlPlaneProvider
+  URL: https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/
 - File: control-plane-components.yaml
   Name: kubeadm
   ProviderType: ControlPlaneProvider

diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md
@@ -18,6 +18,7 @@ updated info about which API version they are supporting.
 - [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
 - [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
 - [Talos](https://github.com/siderolabs/cluster-api-control-plane-provider-talos)
+- [Kamaji](https://github.com/clastix/cluster-api-control-plane-provider-kamaji)
 
 ## Infrastructure
 - [AWS](https://cluster-api-aws.sigs.k8s.io/)