Merge pull request #2099 from xiaokouliu/feat/dev

support for cluster configuration of CiliumOverlay network

Author: andrew-tx

.changelog/2099.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_cluster: support for cluster configuration of CiliumOverlay network
+```

tencentcloud/extension_tke.go

@@ -76,11 +76,12 @@ const (
 )
 
 const (
-	TKE_CLUSTER_NETWORK_TYPE_GR      = "GR"
-	TKE_CLUSTER_NETWORK_TYPE_VPC_CNI = "VPC-CNI"
+	TKE_CLUSTER_NETWORK_TYPE_GR             = "GR"
+	TKE_CLUSTER_NETWORK_TYPE_VPC_CNI        = "VPC-CNI"
+	TKE_CLUSTER_NETWORK_TYPE_CILIUM_OVERLAY = "CiliumOverlay"
 )
 
-var TKE_CLUSTER_NETWORK_TYPE = []string{TKE_CLUSTER_NETWORK_TYPE_GR, TKE_CLUSTER_NETWORK_TYPE_VPC_CNI}
+var TKE_CLUSTER_NETWORK_TYPE = []string{TKE_CLUSTER_NETWORK_TYPE_GR, TKE_CLUSTER_NETWORK_TYPE_VPC_CNI, TKE_CLUSTER_NETWORK_TYPE_CILIUM_OVERLAY}
 
 const (
 	TKE_CLUSTER_NODE_NAME_TYPE_LAN_IP   = "lan-ip"

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -1248,6 +1248,12 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Description: "Operating system of the cluster, the available values include: '" + strings.Join(TKE_CLUSTER_OS, "','") +
 				"'. Default is '" + TKE_CLUSTER_OS_LINUX24 + "'.",
 		},
+		"cluster_subnet_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Subnet ID of the cluster, such as: subnet-b3p7d7q5.",
+		},
+
 		"cluster_os_type": {
 			Type:         schema.TypeString,
 			ForceNew:     true,
@@ -1373,7 +1379,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Optional:     true,
 			Default:      "GR",
 			ValidateFunc: validateAllowedStringValue(TKE_CLUSTER_NETWORK_TYPE),
-			Description:  "Cluster network type, GR or VPC-CNI. Default is GR.",
+			Description:  "Cluster network type, the available values include: 'GR' and 'VPC-CNI' and 'CiliumOverlay'. Default is GR.",
 		},
 		"enable_customized_pod_cidr": {
 			Type: schema.TypeBool,
@@ -2312,7 +2318,7 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 	}
 
 	basic.ClusterOsType = d.Get("cluster_os_type").(string)
-
+	basic.SubnetId = d.Get("cluster_subnet_id").(string)
 	basic.ClusterVersion = d.Get("cluster_version").(string)
 	if v, ok := d.GetOk("cluster_name"); ok {
 		basic.ClusterName = v.(string)
@@ -2402,6 +2408,10 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 		if math.Pow(2, float64(32-bitNumber)) <= float64(cidrSet.MaxNodePodNum) {
 			return fmt.Errorf("`cluster_cidr` Network segment range is too small, can not cover cluster_max_service_num")
 		}
+
+		if advanced.NetworkType == TKE_CLUSTER_NETWORK_TYPE_CILIUM_OVERLAY && d.Get("cluster_subnet_id").(string) == "" {
+			return fmt.Errorf("`cluster_subnet_id` must be set ")
+		}
 	}
 
 	if version, ok := d.GetOk("runtime_version"); ok {
@@ -2962,6 +2972,10 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
 	region := client.Region
 	d.Partial(true)
 
+	if d.HasChange("cluster_subnet_id") {
+		return fmt.Errorf("argument cluster_subnet_id cannot be changed")
+	}
+
 	if d.HasChange("tags") {
 		oldTags, newTags := d.GetChange("tags")
 		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))

tencentcloud/service_tencentcloud_tke.go

@@ -33,6 +33,7 @@ type ClusterBasicSetting struct {
 	ProjectId               int64
 	ClusterNodeNum          int64
 	ClusterStatus           string
+	SubnetId                string
 	Tags                    map[string]string
 }
 
@@ -511,6 +512,9 @@ func (me *TkeService) CreateCluster(ctx context.Context,
 			IsAutoUpgrade: basic.AutoUpgradeClusterLevel,
 		}
 	}
+	if basic.SubnetId != "" {
+		request.ClusterBasicSettings.SubnetId = &basic.SubnetId
+	}
 	for k, v := range tags {
 		if len(request.ClusterBasicSettings.TagSpecification) == 0 {
 			request.ClusterBasicSettings.TagSpecification = []*tke.TagSpecification{{

website/docs/r/kubernetes_cluster.html.markdown

@@ -818,6 +818,7 @@ The following arguments are supported:
 * `cluster_name` - (Optional, String) Name of the cluster.
 * `cluster_os_type` - (Optional, String, ForceNew) Image type of the cluster os, the available values include: 'GENERAL'. Default is 'GENERAL'.
 * `cluster_os` - (Optional, String, ForceNew) Operating system of the cluster, the available values include: 'centos7.6.0_x64','ubuntu18.04.1x86_64','tlinux2.4x86_64'. Default is 'tlinux2.4x86_64'.
+* `cluster_subnet_id` - (Optional, String) Subnet ID of the cluster, such as: subnet-b3p7d7q5.
 * `cluster_version` - (Optional, String) Version of the cluster. Use `tencentcloud_kubernetes_available_cluster_versions` to get the upgradable cluster version.
 * `container_runtime` - (Optional, String, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'.The Kubernetes v1.24 has removed dockershim, so please use containerd in v1.24 or higher.Default is 'docker'.
 * `deletion_protection` - (Optional, Bool) Indicates whether cluster deletion protection is enabled. Default is false.
@@ -837,7 +838,7 @@ The following arguments are supported:
 * `managed_cluster_internet_security_policies` - (Optional, List: [`String`], **Deprecated**) this argument was deprecated, use `cluster_internet_security_group` instead. Security policies for managed cluster internet, like:'192.168.1.0/24' or '113.116.51.27', '0.0.0.0/0' means all. This field can only set when field `cluster_deploy_type` is 'MANAGED_CLUSTER' and `cluster_internet` is true. `managed_cluster_internet_security_policies` can not delete or empty once be set.
 * `master_config` - (Optional, List, ForceNew) Deploy the machine configuration information of the 'MASTER_ETCD' service, and create <=7 units for common users.
 * `mount_target` - (Optional, String, ForceNew) Mount target. Default is not mounting.
-* `network_type` - (Optional, String, ForceNew) Cluster network type, GR or VPC-CNI. Default is GR.
+* `network_type` - (Optional, String, ForceNew) Cluster network type, the available values include: 'GR' and 'VPC-CNI' and 'CiliumOverlay'. Default is GR.
 * `node_name_type` - (Optional, String, ForceNew) Node name type of Cluster, the available values include: 'lan-ip' and 'hostname', Default is 'lan-ip'.
 * `node_pool_global_config` - (Optional, List) Global config effective for all node pools.
 * `project_id` - (Optional, Int) Project ID, default value is 0.