Skip to content

✨ Add BringYourOwnHost(BYOH) provider to clusterctl #5593

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.

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

Merged
merged 3 commits into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/clusterctl/client/config/providers_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
const (
AWSProviderName = "aws"
AzureProviderName = "azure"
BYOHProviderName = "byoh"
DockerProviderName = "docker"
DOProviderName = "digitalocean"
GCPProviderName = "gcp"
Expand Down Expand Up @@ -169,6 +170,11 @@ func (p *providersClient) defaults() []Provider {
url: "https://github.com/spectrocloud/cluster-api-provider-maas/releases/latest/infrastructure-components.yaml",
providerType: clusterctlv1.InfrastructureProviderType,
},
&provider{
name: BYOHProviderName,
url: "https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/releases/latest/infrastructure-components.yaml",
providerType: clusterctlv1.InfrastructureProviderType,
},

// Bootstrap providers
&provider{
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterctl/client/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.TalosControlPlaneProviderName,
config.AWSProviderName,
config.AzureProviderName,
config.BYOHProviderName,
config.DOProviderName,
config.DockerProviderName,
config.GCPProviderName,
Expand Down Expand Up @@ -96,6 +97,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
config.TalosControlPlaneProviderName,
config.AWSProviderName,
config.AzureProviderName,
config.BYOHProviderName,
config.DOProviderName,
config.DockerProviderName,
config.GCPProviderName,
Expand Down
5 changes: 5 additions & 0 deletions cmd/clusterctl/cmd/config_repositories_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ nested ControlPlaneProvider https://github.com/kubernetes-sigs/
talos ControlPlaneProvider https://github.com/talos-systems/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
byoh InfrastructureProvider https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/releases/latest/ infrastructure-components.yaml
digitalocean InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean/releases/latest/ infrastructure-components.yaml
docker InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ infrastructure-components-development.yaml
gcp InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/latest/ infrastructure-components.yaml
Expand Down Expand Up @@ -168,6 +169,10 @@ var expectedOutputYaml = `- File: core_components.yaml
Name: azure
ProviderType: InfrastructureProvider
URL: https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/latest/
- File: infrastructure-components.yaml
Name: byoh
ProviderType: InfrastructureProvider
URL: https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/releases/latest/
- File: infrastructure-components.yaml
Name: digitalocean
ProviderType: InfrastructureProvider
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/clusterctl/provider-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ providers.
|CACPK | cluster.x-k8s.io/provider=control-plane-kubeadm |
|CACPN | cluster.x-k8s.io/provider=control-plane-nested |
|CAPA | cluster.x-k8s.io/provider=infrastructure-aws |
|CAPB | cluster.x-k8s.io/provider=infrastructure-byoh |
|CAPV | cluster.x-k8s.io/provider=infrastructure-vsphere |
|CAPD | cluster.x-k8s.io/provider=infrastructure-docker |
|CAPM3 | cluster.x-k8s.io/provider=infrastructure-metal3 |
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/reference/providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ updated info about which API version they are supporting.
- [Azure](https://github.com/kubernetes-sigs/cluster-api-provider-azure)
- [Azure Stack HCI](https://github.com/microsoft/cluster-api-provider-azurestackhci)
- [Baidu Cloud](https://github.com/baidu/cluster-api-provider-baiducloud)
- [BYOH](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost)
- [Metal3](https://github.com/metal3-io/cluster-api-provider-metal3)
- [DigitalOcean](https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean)
- [Exoscale](https://github.com/exoscale/cluster-api-provider-exoscale)
Expand Down