Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

📖 documentation: new Kamaji cp provider #9403

Merged
merged 2 commits into from
Sep 14, 2023
Merged

📖 documentation: new Kamaji cp provider #9403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f7acd
chore: add kamaji cp provider in provider Implementations list
aamoyel Sep 12, 2023
7eefd83
chore: add kamaji cp provider to clusterctl
aamoyel Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/clusterctl/client/config/providers_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ const (
NestedControlPlaneProviderName = "nested"
OracleCloudNativeControlPlaneProviderName = "ocne"
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
KamajiControlPlaneProviderName = "kamaji"
)

// Add-on providers.
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterctl/client/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions cmd/clusterctl/cmd/config_repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/reference/providers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down