Merge pull request #11876 from k8s-infra-cherrypick-robot/cherry-pick-11861-to-release-1.9

k8s-ci-robot · web-flow · commit 5ef441564461 · 2025-02-20T01:14:27.000-08:00
[release-1.9] 🌱 clusterctl: Add support infrastructure provider for Huawei Cloud
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -48,6 +48,7 @@ const (
 	HarvesterProviderName      = "harvester-harvester"
 	HetznerProviderName        = "hetzner"
 	HivelocityProviderName     = "hivelocity-hivelocity"
+	HuaweiProviderName         = "huawei"
 	OutscaleProviderName       = "outscale"
 	IBMCloudProviderName       = "ibmcloud"
 	InMemoryProviderName       = "in-memory"
@@ -273,6 +274,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/hivelocity/cluster-api-provider-hivelocity/releases/latest/infrastructure-components.yaml",
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
+		&provider{
+			name:         HuaweiProviderName,
+			url:          "https://github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei/releases/latest/infrastructure-components.yaml",
+			providerType: clusterctlv1.InfrastructureProviderType,
+		},
 		&provider{
 			name:         OutscaleProviderName,
 			url:          "https://github.com/outscale/cluster-api-provider-outscale/releases/latest/infrastructure-components.yaml",
diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
@@ -84,6 +84,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.HarvesterProviderName,
 				config.HetznerProviderName,
 				config.HivelocityProviderName,
+				config.HuaweiProviderName,
 				config.IBMCloudProviderName,
 				config.InMemoryProviderName,
 				config.IonosCloudProviderName,
@@ -151,6 +152,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.HarvesterProviderName,
 				config.HetznerProviderName,
 				config.HivelocityProviderName,
+				config.HuaweiProviderName,
 				config.IBMCloudProviderName,
 				config.InMemoryProviderName,
 				config.IonosCloudProviderName,
diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -131,6 +131,7 @@ gcp                     InfrastructureProvider     https://github.com/kubernetes
 harvester-harvester     InfrastructureProvider     https://github.com/rancher-sandbox/cluster-api-provider-harvester/releases/latest/                infrastructure-components.yaml
 hetzner                 InfrastructureProvider     https://github.com/syself/cluster-api-provider-hetzner/releases/latest/                           infrastructure-components.yaml
 hivelocity-hivelocity   InfrastructureProvider     https://github.com/hivelocity/cluster-api-provider-hivelocity/releases/latest/                    infrastructure-components.yaml
+huawei                  InfrastructureProvider     https://github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei/releases/latest/              infrastructure-components.yaml
 ibmcloud                InfrastructureProvider     https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/                 infrastructure-components.yaml
 in-memory               InfrastructureProvider     https://github.com/kubernetes-sigs/cluster-api/releases/latest/                                   infrastructure-components-in-memory-development.yaml
 ionoscloud-ionoscloud   InfrastructureProvider     https://github.com/ionos-cloud/cluster-api-provider-ionoscloud/releases/latest/                   infrastructure-components.yaml
@@ -278,6 +279,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: hivelocity-hivelocity
   ProviderType: InfrastructureProvider
   URL: https://github.com/hivelocity/cluster-api-provider-hivelocity/releases/latest/
+- File: infrastructure-components.yaml
+  Name: huawei
+  ProviderType: InfrastructureProvider
+  URL: https://github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei/releases/latest/
 - File: infrastructure-components.yaml
   Name: ibmcloud
   ProviderType: InfrastructureProvider
diff --git a/docs/book/src/developer/providers/contracts/clusterctl.md b/docs/book/src/developer/providers/contracts/clusterctl.md
@@ -327,6 +327,7 @@ providers.
 | CAPG          | cluster.x-k8s.io/provider=infrastructure-gcp          |
 | CAPH          | cluster.x-k8s.io/provider=infrastructure-hetzner      |
 | CAPHV         | cluster.x-k8s.io/provider=infrastructure-hivelocity   |
+| CAPHW         | cluster.x-k8s.io/provider=infrastructure-huawei       |
 | CAPIBM        | cluster.x-k8s.io/provider=infrastructure-ibmcloud     |
 | CAPKK         | cluster.x-k8s.io/provider=infrastructure-kubekey      |
 | CAPK          | cluster.x-k8s.io/provider=infrastructure-kubevirt     |
diff --git a/docs/book/src/reference/glossary.md b/docs/book/src/reference/glossary.md
@@ -63,6 +63,9 @@ Cluster API Provider Hetzner
 ### CAPHV
 Cluster API Provider Hivelocity
 
+### CAPHW
+Cluster API Provider Huawei
+
 ### CAPIBM
 Cluster API Provider IBM Cloud
 
diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md
@@ -39,6 +39,7 @@ updated info about which API version they are supporting.
 - [Google Cloud Platform (GCP)](https://cluster-api-gcp.sigs.k8s.io/)
 - [Hetzner](https://github.com/syself/cluster-api-provider-hetzner)
 - [Hivelocity](https://github.com/hivelocity/cluster-api-provider-hivelocity)
+- [Huawei Cloud](https://github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei)
 - [IBM Cloud](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud)
 - [IONOS Cloud](https://github.com/ionos-cloud/cluster-api-provider-ionoscloud)
 - [KubeKey](https://github.com/kubesphere/kubekey)
diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md
@@ -281,7 +281,7 @@ Additional documentation about experimental features can be found in [Experiment
 Depending on the infrastructure provider you are planning to use, some additional prerequisites should be satisfied
 before getting started with Cluster API. See below for the expected settings for common providers.
 
-{{#tabs name:"tab-installation-infrastructure" tabs:"Akamai (Linode),AWS,Azure,CloudStack,DigitalOcean,Docker,Equinix Metal,GCP,Harvester,Hetzner,Hivelocity,IBM Cloud,IONOS Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OCI,OpenStack,Outscale,Proxmox,VCD,vcluster,Virtink,vSphere,Vultr"}}
+{{#tabs name:"tab-installation-infrastructure" tabs:"Akamai (Linode),AWS,Azure,CloudStack,DigitalOcean,Docker,Equinix Metal,GCP,Harvester,Hetzner,Hivelocity,Huawei,IBM Cloud,IONOS Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OCI,OpenStack,Outscale,Proxmox,VCD,vcluster,Virtink,vSphere,Vultr"}}
 {{#tab Akamai (Linode)}}
 
 ```bash
@@ -592,6 +592,18 @@ Please visit the [Hetzner project][Hetzner provider].
 
 Please visit the [Hivelocity project][Hivelocity provider].
 
+{{#/tab }}
+{{#tab Huawei}}
+
+```bash
+# Please ensure that the values for `CLOUD_SDK_AK` and `CLOUD_SDK_SK` are base64 encoded.
+export CLOUD_SDK_AK=$( echo $AccessKey | base64 | tr -d '\n' )
+export CLOUD_SDK_SK=$( echo $SecretKey | base64 | tr -d '\n' )
+
+# Finally, initialize the management cluster
+clusterctl init --infrastructure huawei
+```
+
 {{#/tab }}
 {{#tab IBM Cloud}}
 
@@ -883,7 +895,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,Harvester,IBM Cloud,IONOS Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OpenStack,Outscale,Proxmox,Tinkerbell,VCD,vcluster,Virtink,vSphere,Vultr"}}
+{{#tabs name:"tab-configuration-infrastructure" tabs:"Akamai (Linode),AWS,Azure,CloudStack,DigitalOcean,Docker,Equinix Metal,GCP,Harvester,Huawei,IBM Cloud,IONOS Cloud,K0smotron,KubeKey,KubeVirt,Metal3,Nutanix,OpenStack,Outscale,Proxmox,Tinkerbell,VCD,vcluster,Virtink,vSphere,Vultr"}}
 {{#tab Akamai (Linode)}}
 
 ```bash
@@ -1102,6 +1114,31 @@ export WORKER_MACHINE_COUNT=2
 
 See the [Harvester provider] for more information.
 
+{{#/tab }}
+{{#tab Huawei}}
+
+
+```bash
+# huawei cloud region
+export HC_REGION="cn-east-1"
+# ECS SSH key name
+export HC_SSH_KEY_NAME="default"
+# kubernetes version
+export KUBERNETES_VERSION="1.32.0"
+# number of control plane machines
+export CONTROL_PLANE_MACHINE_COUNT="1"
+# number of worker machines
+export WORKER_MACHINE_COUNT="1"
+# control plane machine type
+export HC_CONTROL_PLANE_MACHINE_TYPE="x1e.2u.4g"
+# worker node machine type
+export HC_NODE_MACHINE_TYPE="x1e.2u.4g"
+# ECS image ID
+export ECS_IMAGE_ID="218ca5t7-bxf3-5dg0-852p-y703c9fe1a52"
+```
+
+See the [Huawei Cloud provider] for more information.
+
 {{#/tab }}
 {{#tab IBM Cloud}}
 
@@ -1876,6 +1913,7 @@ kind delete cluster
 [Harvester provider]: https://github.com/rancher-sandbox/cluster-api-provider-harvester
 [Hetzner provider]: https://github.com/syself/cluster-api-provider-hetzner
 [Hivelocity provider]: https://github.com/hivelocity/cluster-api-provider-hivelocity
+[Huawei Cloud provider]: https://github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei
 [IBM Cloud provider]: https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud
 [infrastructure provider]: ../reference/glossary.md#infrastructure-provider
 [ionoscloud provider]: https://github.com/ionos-cloud/cluster-api-provider-ionoscloud
