From 42259d1e0f28b34e2adc0476a1097a791ed30340 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Thu, 25 Apr 2024 22:35:38 -0700 Subject: [PATCH] =?UTF-8?q?[release-1.7]=20=F0=9F=8C=B1=20Add=20Tinkerbell?= =?UTF-8?q?=20to=20the=20providers=20list=20(#10516)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add Tinkerbell to the providers list * Add Tinkerbell docs * Update TinkerbellProviderName to conform with new naming scheme --------- Co-authored-by: Oprin Marius --- cmd/clusterctl/client/config/providers_client.go | 6 ++++++ cmd/clusterctl/client/config_test.go | 2 ++ cmd/clusterctl/cmd/config_repositories_test.go | 5 +++++ docs/book/src/clusterctl/provider-contract.md | 1 + docs/book/src/reference/glossary.md | 3 +++ docs/book/src/user/quick-start.md | 11 ++++++++++- .../internal/update_providers/provider_issues.go | 1 + 7 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go index 4bead6ba9f24..09604454e951 100644 --- a/cmd/clusterctl/client/config/providers_client.go +++ b/cmd/clusterctl/client/config/providers_client.go @@ -56,6 +56,7 @@ const ( OCIProviderName = "oci" OpenStackProviderName = "openstack" PacketProviderName = "packet" + TinkerbellProviderName = "tinkerbell-tinkerbell" SideroProviderName = "sidero" VCloudDirectorProviderName = "vcd" VSphereProviderName = "vsphere" @@ -191,6 +192,11 @@ func (p *providersClient) defaults() []Provider { url: "https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/latest/infrastructure-components.yaml", providerType: clusterctlv1.InfrastructureProviderType, }, + &provider{ + name: TinkerbellProviderName, + url: "https://github.com/tinkerbell/cluster-api-provider-tinkerbell/releases/latest/infrastructure-components.yaml", + providerType: clusterctlv1.InfrastructureProviderType, + }, &provider{ name: Metal3ProviderName, url: "https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/infrastructure-components.yaml", diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go index 791bae6f2812..37a72bfb02dd 100644 --- a/cmd/clusterctl/client/config_test.go +++ b/cmd/clusterctl/client/config_test.go @@ -99,6 +99,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) { config.PacketProviderName, config.ProxmoxProviderName, config.SideroProviderName, + config.TinkerbellProviderName, config.VCloudDirectorProviderName, config.VclusterProviderName, config.VirtinkProviderName, @@ -159,6 +160,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) { config.PacketProviderName, config.ProxmoxProviderName, config.SideroProviderName, + config.TinkerbellProviderName, config.VCloudDirectorProviderName, config.VclusterProviderName, config.VirtinkProviderName, diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go index 6e5fd708d1c6..5b0f9a74a3b4 100644 --- a/cmd/clusterctl/cmd/config_repositories_test.go +++ b/cmd/clusterctl/cmd/config_repositories_test.go @@ -148,6 +148,7 @@ outscale InfrastructureProvider https://github.com/outscale/clu packet InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/latest/ infrastructure-components.yaml proxmox InfrastructureProvider https://github.com/ionos-cloud/cluster-api-provider-proxmox/releases/latest/ infrastructure-components.yaml sidero InfrastructureProvider https://github.com/siderolabs/sidero/releases/latest/ infrastructure-components.yaml +tinkerbell-tinkerbell InfrastructureProvider https://github.com/tinkerbell/cluster-api-provider-tinkerbell/releases/latest/ infrastructure-components.yaml vcd InfrastructureProvider https://github.com/vmware/cluster-api-provider-cloud-director/releases/latest/ infrastructure-components.yaml vcluster InfrastructureProvider https://github.com/loft-sh/cluster-api-provider-vcluster/releases/latest/ infrastructure-components.yaml virtink InfrastructureProvider https://github.com/smartxworks/cluster-api-provider-virtink/releases/latest/ infrastructure-components.yaml @@ -336,6 +337,10 @@ var expectedOutputYaml = `- File: core_components.yaml Name: sidero ProviderType: InfrastructureProvider URL: https://github.com/siderolabs/sidero/releases/latest/ +- File: infrastructure-components.yaml + Name: tinkerbell-tinkerbell + ProviderType: InfrastructureProvider + URL: https://github.com/tinkerbell/cluster-api-provider-tinkerbell/releases/latest/ - File: infrastructure-components.yaml Name: vcd ProviderType: InfrastructureProvider diff --git a/docs/book/src/clusterctl/provider-contract.md b/docs/book/src/clusterctl/provider-contract.md index b1ad3e261685..5904aced2b1f 100644 --- a/docs/book/src/clusterctl/provider-contract.md +++ b/docs/book/src/clusterctl/provider-contract.md @@ -330,6 +330,7 @@ providers. | CAPO | cluster.x-k8s.io/provider=infrastructure-openstack | | CAPOCI | cluster.x-k8s.io/provider=infrastructure-oci | | CAPP | cluster.x-k8s.io/provider=infrastructure-packet | +| CAPT | cluster.x-k8s.io/provider=infrastructure-tinkerbell | | CAPV | cluster.x-k8s.io/provider=infrastructure-vsphere | | CAPVC | cluster.x-k8s.io/provider=infrastructure-vcluster | | CAPVCD | cluster.x-k8s.io/provider=infrastructure-vcd | diff --git a/docs/book/src/reference/glossary.md b/docs/book/src/reference/glossary.md index a16f9da6996c..5f82b88d82ac 100644 --- a/docs/book/src/reference/glossary.md +++ b/docs/book/src/reference/glossary.md @@ -102,6 +102,9 @@ Cluster API Provider Outscale ### CAPOCI Cluster API Provider Oracle Cloud Infrastructure (OCI) +### CAPT +Cluster API Provider Tinkerbell + ### CAPV Cluster API Provider vSphere diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md index 199736040093..143558e403e5 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -861,7 +861,7 @@ before configuring a cluster with Cluster API. Instructions are provided for com Otherwise, you can look at the `clusterctl generate cluster` [command][clusterctl generate cluster] documentation for details about how to discover the list of variables required by a cluster templates. -{{#tabs name:"tab-configuration-infrastructure" tabs:"Akamai (Linode),AWS,Azure,CloudStack,DigitalOcean,Docker,Equinix Metal,GCP,IBM Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OpenStack,Outscale,Proxmox,VCD,vcluster,Virtink,vSphere"}} +{{#tabs name:"tab-configuration-infrastructure" tabs:"Akamai (Linode),AWS,Azure,CloudStack,DigitalOcean,Docker,Equinix Metal,GCP,IBM Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OpenStack,Outscale,Proxmox,Tinkerbell,VCD,vcluster,Virtink,vSphere"}} {{#tab Akamai (Linode)}} ```bash @@ -1241,6 +1241,14 @@ export ALLOWED_NODES="[pve1,pve2,pve3]" For more information about prerequisites and advanced setups for Proxmox, see the [Proxmox getting started guide]. +{{#/tab }} +{{#tab Tinkerbell}} + +```bash +export TINKERBELL_IP= +``` +For more information please visit [Tinkerbell getting started guide]. + {{#/tab }} {{#tab VCD}} @@ -1763,3 +1771,4 @@ kind delete cluster [workload cluster]: ../reference/glossary.md#workload-cluster [CAPI Operator quickstart]: ./quick-start-operator.md [Proxmox getting started guide]: https://github.com/ionos-cloud/cluster-api-provider-proxmox/blob/main/docs/Usage.md +[Tinkerbell getting started guide]: https://github.com/tinkerbell/cluster-api-provider-tinkerbell/blob/main/docs/QUICK-START.md \ No newline at end of file diff --git a/hack/tools/release/internal/update_providers/provider_issues.go b/hack/tools/release/internal/update_providers/provider_issues.go index 6616cf2dea1a..e79d078d659b 100644 --- a/hack/tools/release/internal/update_providers/provider_issues.go +++ b/hack/tools/release/internal/update_providers/provider_issues.go @@ -56,6 +56,7 @@ var ( "kubernetes-sigs/cluster-api-provider-openstack", "kubernetes-sigs/cluster-api-operator", "kubernetes-sigs/cluster-api-provider-packet", + "tinkerbell/cluster-api-provider-tinkerbell", "kubernetes-sigs/cluster-api-provider-vsphere", "metal3-io/cluster-api-provider-metal3", }