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

✨ Add RKE2 bootstrap provider to clusterctl #9720

Merged
merged 1 commit into from
Nov 15, 2023
Merged

✨ Add RKE2 bootstrap provider to clusterctl #9720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 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 @@ -72,6 +72,7 @@ const (
MicroK8sBootstrapProviderName = "microk8s"
OracleCloudNativeBootstrapProviderName = "ocne"
KubeKeyK3sBootstrapProviderName = "kubekey-k3s"
RKE2BootstrapProviderName = "rke2"
)

// ControlPlane providers.
Expand All @@ -83,6 +84,7 @@ const (
OracleCloudNativeControlPlaneProviderName = "ocne"
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
KamajiControlPlaneProviderName = "kamaji"
RKE2ControlPlaneProviderName = "rke2"
)

// Add-on providers.
Expand Down Expand Up @@ -295,6 +297,11 @@ func (p *providersClient) defaults() []Provider {
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/bootstrap-components.yaml",
providerType: clusterctlv1.BootstrapProviderType,
},
&provider{
name: RKE2BootstrapProviderName,
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
providerType: clusterctlv1.BootstrapProviderType,
},

// ControlPlane providers
&provider{
Expand Down Expand Up @@ -332,6 +339,11 @@ func (p *providersClient) defaults() []Provider {
url: "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/control-plane-components.yaml",
providerType: clusterctlv1.ControlPlaneProviderType,
},
&provider{
name: RKE2ControlPlaneProviderName,
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/control-plane-components.yaml",
providerType: clusterctlv1.ControlPlaneProviderType,
},

// Add-on providers
&provider{
Expand Down
4 changes: 4 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 @@ -61,13 +61,15 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.KubeKeyK3sBootstrapProviderName,
config.MicroK8sBootstrapProviderName,
config.OracleCloudNativeBootstrapProviderName,
config.RKE2BootstrapProviderName,
config.TalosBootstrapProviderName,
config.KamajiControlPlaneProviderName,
config.KubeadmControlPlaneProviderName,
config.KubeKeyK3sControlPlaneProviderName,
config.MicroK8sControlPlaneProviderName,
config.NestedControlPlaneProviderName,
config.OracleCloudNativeControlPlaneProviderName,
config.RKE2ControlPlaneProviderName,
config.TalosControlPlaneProviderName,
config.AWSProviderName,
config.AzureProviderName,
Expand Down Expand Up @@ -112,13 +114,15 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.KubeKeyK3sBootstrapProviderName,
config.MicroK8sBootstrapProviderName,
config.OracleCloudNativeBootstrapProviderName,
config.RKE2BootstrapProviderName,
config.TalosBootstrapProviderName,
config.KamajiControlPlaneProviderName,
config.KubeadmControlPlaneProviderName,
config.KubeKeyK3sControlPlaneProviderName,
config.MicroK8sControlPlaneProviderName,
config.NestedControlPlaneProviderName,
config.OracleCloudNativeControlPlaneProviderName,
config.RKE2ControlPlaneProviderName,
config.TalosControlPlaneProviderName,
config.AWSProviderName,
config.AzureProviderName,
Expand Down
10 changes: 10 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 @@ -109,13 +109,15 @@ kubeadm BootstrapProvider https://github.com/kubernetes-sigs/
kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubekey/releases/latest/ bootstrap-components.yaml
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
rke2 BootstrapProvider https://github.com/rancher-sandbox/cluster-api-provider-rke2/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
nested ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ control-plane-components.yaml
ocne ControlPlaneProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ control-plane-components.yaml
rke2 ControlPlaneProvider https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/ control-plane-components.yaml
talos ControlPlaneProvider https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/ control-plane-components.yaml
aws InfrastructureProvider my-aws-infrastructure-components.yaml
azure InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/latest/ infrastructure-components.yaml
Expand Down Expand Up @@ -171,6 +173,10 @@ var expectedOutputYaml = `- File: core_components.yaml
Name: ocne
ProviderType: BootstrapProvider
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
- File: bootstrap-components.yaml
Name: rke2
ProviderType: BootstrapProvider
URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
- File: bootstrap-components.yaml
Name: talos
ProviderType: BootstrapProvider
Expand Down Expand Up @@ -199,6 +205,10 @@ var expectedOutputYaml = `- File: core_components.yaml
Name: ocne
ProviderType: ControlPlaneProvider
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
- File: control-plane-components.yaml
Name: rke2
ProviderType: ControlPlaneProvider
URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/latest/
- File: control-plane-components.yaml
Name: talos
ProviderType: ControlPlaneProvider
Expand Down