Skip to content

Commit 818da4f

Browse files
authored
Merge pull request kubernetes-sigs#9403 from aamoyel/doc-kamaji-cp-provider
📖 documentation: new Kamaji cp provider
2 parents c4e2d67 + 7eefd83 commit 818da4f

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed

cmd/clusterctl/client/config/providers_client.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const (
8282
NestedControlPlaneProviderName = "nested"
8383
OracleCloudNativeControlPlaneProviderName = "ocne"
8484
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
85+
KamajiControlPlaneProviderName = "kamaji"
8586
)
8687

8788
// Add-on providers.
@@ -326,6 +327,11 @@ func (p *providersClient) defaults() []Provider {
326327
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/control-plane-components.yaml",
327328
providerType: clusterctlv1.ControlPlaneProviderType,
328329
},
330+
&provider{
331+
name: KamajiControlPlaneProviderName,
332+
url: "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/control-plane-components.yaml",
333+
providerType: clusterctlv1.ControlPlaneProviderType,
334+
},
329335

330336
// Add-on providers
331337
&provider{

cmd/clusterctl/client/config_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
6262
config.MicroK8sBootstrapProviderName,
6363
config.OracleCloudNativeBootstrapProviderName,
6464
config.TalosBootstrapProviderName,
65+
config.KamajiControlPlaneProviderName,
6566
config.KubeadmControlPlaneProviderName,
6667
config.KubeKeyK3sControlPlaneProviderName,
6768
config.MicroK8sControlPlaneProviderName,
@@ -112,6 +113,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
112113
config.MicroK8sBootstrapProviderName,
113114
config.OracleCloudNativeBootstrapProviderName,
114115
config.TalosBootstrapProviderName,
116+
config.KamajiControlPlaneProviderName,
115117
config.KubeadmControlPlaneProviderName,
116118
config.KubeKeyK3sControlPlaneProviderName,
117119
config.MicroK8sControlPlaneProviderName,

cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubek
110110
microk8s BootstrapProvider https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/ bootstrap-components.yaml
111111
ocne BootstrapProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ bootstrap-components.yaml
112112
talos BootstrapProvider https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml
113+
kamaji ControlPlaneProvider https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/ control-plane-components.yaml
113114
kubeadm ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ control-plane-components.yaml
114115
kubekey-k3s ControlPlaneProvider https://github.com/kubesphere/kubekey/releases/latest/ control-plane-components.yaml
115116
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
174175
Name: talos
175176
ProviderType: BootstrapProvider
176177
URL: https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/
178+
- File: control-plane-components.yaml
179+
Name: kamaji
180+
ProviderType: ControlPlaneProvider
181+
URL: https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/
177182
- File: control-plane-components.yaml
178183
Name: kubeadm
179184
ProviderType: ControlPlaneProvider

docs/book/src/reference/providers.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ updated info about which API version they are supporting.
1818
- [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
1919
- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
2020
- [Talos](https://github.com/siderolabs/cluster-api-control-plane-provider-talos)
21+
- [Kamaji](https://github.com/clastix/cluster-api-control-plane-provider-kamaji)
2122

2223
## Infrastructure
2324
- [AWS](https://cluster-api-aws.sigs.k8s.io/)

0 commit comments

Comments
 (0)