Merge pull request #605 from junchuguo/master

gailwang · web-flow · commit ceb5bc082eab · 2021-03-22T10:19:47.000+08:00
add tke unschedulable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ FEATURES:
 * **New Resource**: `tencentcloud_kms_external_key`
 * **New Data Source**: `tencentcloud_kms_keys` 
 
+ENHANCEMENTS:
+
+* Resource `tencentcloud_kubernetes_cluster_attachment` add `unschedulable` to sets whether the joining node participates in the schedule.
+* Resource `tencentcloud_kubernetes_cluster` add `unschedulable` to sets whether the joining node participates in the schedule.
+* Resource `tencentcloud_kubernetes_node_pool` add `unschedulable` to sets whether the joining node participates in the schedule.
+* Resource `tencentcloud_kubernetes_scale_worker` add `unschedulable` to sets whether the joining node participates in the schedule.
+
 ## 1.53.9 (March 19, 2021)
 
 ENHANCEMENTS:
diff --git a/tencentcloud/resource_tc_kubernetes_as_scaling_group.go b/tencentcloud/resource_tc_kubernetes_as_scaling_group.go
@@ -186,6 +186,13 @@ func ResourceTencentCloudKubernetesAsScalingGroup() *schema.Resource {
 				Elem:        &schema.Schema{Type: schema.TypeString},
 				Description: "Custom parameter information related to the node.",
 			},
+			"unschedulable": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     0,
+				Description: "Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.",
+			},
 		},
 	}
 }
@@ -844,7 +851,9 @@ func resourceKubernetesAsScalingGroupCreate(d *schema.ResourceData, meta interfa
 	}
 
 	labels := GetTkeLabels(d, "labels")
-
+	if temp, ok := d.GetOk("unschedulable"); ok {
+		iAdvanced.Unschedulable = int64(temp.(int))
+	}
 	if temp, ok := d.GetOk("extra_args"); ok {
 		extraArgs := helper.InterfacesStrings(temp.([]interface{}))
 		for _, extraArg := range extraArgs {
diff --git a/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go b/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go
@@ -212,7 +212,7 @@ resource "tencentcloud_kubernetes_as_scaling_group" "as_test" {
     }
 
   }
-
+  unschedulable = 0
   labels = {
     "test1" = "test1",
     "test2" = "test2",
@@ -271,7 +271,7 @@ resource "tencentcloud_kubernetes_as_scaling_group" "as_test" {
     }
 
   }
-
+  unschedulable = 1
   labels = {
     "test1" = "test1",
     "test2" = "test2",
diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go
@@ -830,6 +830,13 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			ForceNew:    true,
 			Description: "Labels of tke cluster nodes.",
 		},
+		"unschedulable": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			ForceNew:    true,
+			Default:     0,
+			Description: "Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.",
+		},
 		"mount_target": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -1290,7 +1297,9 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 			iAdvanced.ExtraArgs.Kubelet = append(iAdvanced.ExtraArgs.Kubelet, &extraArgs[i])
 		}
 	}
-
+	if temp, ok := d.GetOk("unschedulable"); ok {
+		iAdvanced.Unschedulable = int64(temp.(int))
+	}
 	if temp, ok := d.GetOk("docker_graph_path"); ok {
 		iAdvanced.DockerGraphPath = temp.(string)
 	}
diff --git a/tencentcloud/resource_tc_kubernetes_cluster_attachment.go b/tencentcloud/resource_tc_kubernetes_cluster_attachment.go
@@ -248,6 +248,13 @@ func resourceTencentCloudTkeClusterAttachment() *schema.Resource {
 			ForceNew:    true,
 			Description: "Labels of tke attachment exits CVM.",
 		},
+		"unschedulable": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			ForceNew:    true,
+			Default:     0,
+			Description: "Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.",
+		},
 		//compute
 		"security_groups": {
 			Type:        schema.TypeSet,
@@ -399,6 +406,7 @@ func resourceTencentCloudTkeClusterAttachmentRead(d *schema.ResourceData, meta i
 					return resource.RetryableError(fmt.Errorf("cvm instance  %s in tke status is %s, retry...",
 						worker.InstanceId, worker.InstanceState))
 				}
+				_ = d.Set("unschedulable", worker.InstanceAdvancedSettings.Unschedulable)
 			}
 		}
 
@@ -471,6 +479,10 @@ func resourceTencentCloudTkeClusterAttachmentCreate(d *schema.ResourceData, meta
 		request.HostName = &hostNameStr
 	}
 
+	if v, ok := d.GetOk("unschedulable"); ok {
+		request.InstanceAdvancedSettings.Unschedulable = helper.Int64(v.(int64))
+	}
+
 	/*cvm has been  attached*/
 	var err error
 	_, workers, err := tkeService.DescribeClusterInstances(ctx, *request.ClusterId)
diff --git a/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go b/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go
@@ -22,6 +22,7 @@ func TestAccTencentCloudTkeAttachResource(t *testing.T) {
 					testAccCheckTkeAttachExists("tencentcloud_kubernetes_cluster_attachment.test_attach"),
 					resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "cluster_id"),
 					resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "instance_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "unschedulable"),
 					resource.TestCheckResourceAttr("tencentcloud_kubernetes_cluster_attachment.test_attach", "labels.test1", "test1"),
 					resource.TestCheckResourceAttr("tencentcloud_kubernetes_cluster_attachment.test_attach", "labels.test2", "test2"),
 				),
@@ -209,15 +210,13 @@ resource "tencentcloud_kubernetes_cluster_attachment" "test_attach" {
   cluster_id  = tencentcloud_kubernetes_cluster.managed_cluster.id
   instance_id = tencentcloud_instance.foo.id
   password    = "Lo4wbdit"
+  unschedulable = 0
 
   labels = {
     "test1" = "test1",
     "test2" = "test2",
   }
 
-  extra_args = [
- 	"root-dir=/var/lib/kubelet"
-  ]
 }
 `
 }
diff --git a/tencentcloud/resource_tc_kubernetes_cluster_test.go b/tencentcloud/resource_tc_kubernetes_cluster_test.go
@@ -38,6 +38,7 @@ func TestAccTencentCloudTkeResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testTkeClusterResourceKey, "cluster_external_endpoint"),
 					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test1", "test1"),
 					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test2", "test2"),
+					resource.TestCheckResourceAttr(testTkeClusterResourceKey, "unschedulable", "0"),
 				),
 			},
 			{
@@ -191,6 +192,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
     "%s" = "%s"
   }
 
+  unschedulable = 0
+
   labels = {
     "test1" = "test1",
     "test2" = "test2",
diff --git a/tencentcloud/resource_tc_kubernetes_node_pool.go b/tencentcloud/resource_tc_kubernetes_node_pool.go
@@ -327,6 +327,13 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 				Optional:    true,
 				Description: "Labels of kubernetes node pool created nodes. The label key name does not exceed 63 characters, only supports English, numbers,'/','-', and does not allow beginning with ('/').",
 			},
+			"unschedulable": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     0,
+				Description: "Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.",
+			},
 			"taints": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -695,6 +702,9 @@ func resourceKubernetesNodePoolCreate(d *schema.ResourceData, meta interface{})
 			iAdvanced.ExtraArgs.Kubelet = append(iAdvanced.ExtraArgs.Kubelet, &extraArg)
 		}
 	}
+	if temp, ok := d.GetOk("unschedulable"); ok {
+		iAdvanced.Unschedulable = helper.Int64(int64(temp.(int)))
+	}
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 
diff --git a/tencentcloud/resource_tc_kubernetes_node_pool_test.go b/tencentcloud/resource_tc_kubernetes_node_pool_test.go
@@ -33,6 +33,7 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "min_size", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "desired_capacity", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "name", "mynodepool"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "unschedulable", "0"),
 				),
 			},
 			{
@@ -48,6 +49,7 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "desired_capacity", "2"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "name", "mynodepoolupdate"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "node_os", "ubuntu18.04.1x86_64"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "unschedulable", "1"),
 				),
 			},
 		},
@@ -207,7 +209,7 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     enhanced_monitor_service   = false
 
   }
-
+  unschedulable = 0
   labels = {
     "test1" = "test1",
     "test2" = "test2",
@@ -261,7 +263,7 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     enhanced_monitor_service   = false
 
   }
-
+  unschedulable = 1
   labels = {
     "test3" = "test3",
     "test2" = "test2",
diff --git a/tencentcloud/resource_tc_kubernetes_scale_worker.go b/tencentcloud/resource_tc_kubernetes_scale_worker.go
@@ -109,6 +109,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
@@ -152,6 +154,13 @@ func resourceTencentCloudTkeScaleWorker() *schema.Resource {
 				Elem:        &schema.Schema{Type: schema.TypeString},
 				Description: "Custom parameter information related to the node.",
 			},
+			"unschedulable": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     0,
+				Description: "Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.",
+			},
 			"docker_graph_path": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -270,6 +279,9 @@ func resourceTencentCloudTkeScaleWorkerCreate(d *schema.ResourceData, meta inter
 	iAdvanced = tkeGetInstanceAdvancedPara(dMap, meta)
 
 	iAdvanced.Labels = GetTkeLabels(d, "labels")
+	if temp, ok := d.GetOk("unschedulable"); ok {
+		iAdvanced.Unschedulable = helper.Int64(int64(temp.(int)))
+	}
 
 	if workers, ok := d.GetOk("worker_config"); ok {
 		workerList := workers.([]interface{})
diff --git a/tencentcloud/resource_tc_kubernetes_scale_worker_test.go b/tencentcloud/resource_tc_kubernetes_scale_worker_test.go
@@ -28,7 +28,9 @@ func TestAccTencentCloudTkeScaleWorkerResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_config.#"),
 					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "worker_instances_list.#", "1"),
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_instances_list.0.instance_id"),
-					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_instances_list.0.instance_role")),
+					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_instances_list.0.instance_role"),
+					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "unschedulable"),
+				),
 			},
 		},
 	})
@@ -193,6 +195,7 @@ resource tencentcloud_kubernetes_scale_worker test_scale {
     "test1" = "test1",
     "test2" = "test2",
   }
+  unschedulable = 0
 
   worker_config {
     count                      				= 1
diff --git a/tencentcloud/resource_tc_tcr_instance.go b/tencentcloud/resource_tc_tcr_instance.go
@@ -65,7 +65,6 @@ func resourceTencentCloudTcrInstance() *schema.Resource {
 			"open_public_operation": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				ForceNew:    true,
 				Default:     false,
 				Description: "Control public network access.",
 			},
@@ -240,6 +239,36 @@ func resourceTencentCloudTcrInstanceRead(d *schema.ResourceData, meta interface{
 func resourceTencentCloudTcrInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_tcr_instance.update")()
 	//delete_bucket
+	var (
+		outErr, inErr error
+		instanceId    string
+		operation     bool
+	)
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	tcrService := TCRService{client: meta.(*TencentCloudClient).apiV3Conn}
+	instanceId = d.Id()
+	if d.HasChange("open_public_operation") {
+		operation = d.Get("open_public_operation").(bool)
+		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			if v, ok := d.GetOk("open_public_operation"); ok {
+				operation = v.(bool)
+				if operation {
+					inErr = tcrService.ManageTCRExternalEndpoint(ctx, instanceId, "Create")
+				} else {
+					inErr = tcrService.ManageTCRExternalEndpoint(ctx, instanceId, "Delete")
+				}
+				if inErr != nil {
+					return retryError(inErr)
+				}
+			}
+			return nil
+		})
+		if outErr != nil {
+			return outErr
+		}
+	}
 	return resourceTencentCloudTcrInstanceRead(d, meta)
 }
 
diff --git a/website/docs/r/kubernetes_as_scaling_group.html.markdown b/website/docs/r/kubernetes_as_scaling_group.html.markdown
@@ -141,6 +141,7 @@ The following arguments are supported:
 * `cluster_id` - (Required, ForceNew) ID of the cluster.
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
 * `labels` - (Optional, ForceNew) Labels of kubernetes AS Group created nodes.
+* `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
 
 The `auto_scaling_config` object supports the following:
 
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
@@ -240,6 +240,7 @@ The following arguments are supported:
 * `project_id` - (Optional) Project ID, default value is 0.
 * `service_cidr` - (Optional, ForceNew) A network address block of the service. Different from vpc cidr and cidr of other clusters within this vpc. Must be in  10./192.168/172.[16-31] segments.
 * `tags` - (Optional) The tags of the cluster.
+* `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
 * `worker_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'WORKER' service, and create <=20 units for common users. The other 'WORK' service are added by 'tencentcloud_kubernetes_worker'.
 
 The `cluster_extra_args` object supports the following:
diff --git a/website/docs/r/kubernetes_cluster_attachment.html.markdown b/website/docs/r/kubernetes_cluster_attachment.html.markdown
@@ -110,6 +110,7 @@ The following arguments are supported:
 * `key_ids` - (Optional, ForceNew) The key pair to use for the instance, it looks like skey-16jig7tx, it should be set if `password` not set.
 * `labels` - (Optional, ForceNew) Labels of tke attachment exits CVM.
 * `password` - (Optional, ForceNew) Password to access, should be set if `key_ids` not set.
+* `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
 * `worker_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'WORKER', commonly used to attach existing instances.
 
 The `data_disk` object supports the following:
diff --git a/website/docs/r/kubernetes_node_pool.html.markdown b/website/docs/r/kubernetes_node_pool.html.markdown
@@ -123,6 +123,7 @@ The following arguments are supported:
 * `scaling_mode` - (Optional, ForceNew) Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/destroy instances), `WAKE_UP_STOPPED_SCALING`(Boot priority for expansion. When expanding the capacity, the shutdown operation is given priority to the shutdown of the instance. If the number of instances is still lower than the expected number of instances after the startup, the instance will be created, and the method of destroying the instance will still be used for shrinking).
 * `subnet_ids` - (Optional, ForceNew) ID list of subnet, and for VPC it is required.
 * `taints` - (Optional) Taints of kubernetes node pool created nodes.
+* `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
 
 The `auto_scaling_config` object supports the following:
 
diff --git a/website/docs/r/kubernetes_scale_worker.html.markdown b/website/docs/r/kubernetes_scale_worker.html.markdown
@@ -120,6 +120,7 @@ The following arguments are supported:
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
 * `labels` - (Optional, ForceNew) Labels of kubernetes scale worker created nodes.
 * `mount_target` - (Optional, ForceNew) Mount target. Default is not mounting.
+* `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
 
 The `data_disk` object supports the following:
 
diff --git a/website/docs/r/tcr_instance.html.markdown b/website/docs/r/tcr_instance.html.markdown
@@ -31,7 +31,7 @@ The following arguments are supported:
 * `instance_type` - (Required, ForceNew) TCR types. Valid values are: `standard`, `basic`, `premium`.
 * `name` - (Required, ForceNew) Name of the TCR instance.
 * `delete_bucket` - (Optional) Indicate to delete the COS bucket which is auto-created with the instance or not.
-* `open_public_operation` - (Optional, ForceNew) Control public network access.
+* `open_public_operation` - (Optional) Control public network access.
 * `tags` - (Optional, ForceNew) The available tags within this TCR instance.
 
 ## Attributes Reference

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ resource "tencentcloud_kubernetes_as_scaling_group" "as_test" {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`}`
`215`		`-`
	`215`	`+ unschedulable = 0`
`216`	`216`	`labels = {`
`217`	`217`	`"test1" = "test1",`
`218`	`218`	`"test2" = "test2",`
`@@ -271,7 +271,7 @@ resource "tencentcloud_kubernetes_as_scaling_group" "as_test" {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`}`
`274`		`-`
	`274`	`+ unschedulable = 1`
`275`	`275`	`labels = {`
`276`	`276`	`"test1" = "test1",`
`277`	`277`	`"test2" = "test2",`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func TestAccTencentCloudTkeAttachResource(t *testing.T) {`
`22`	`22`	`testAccCheckTkeAttachExists("tencentcloud_kubernetes_cluster_attachment.test_attach"),`
`23`	`23`	`resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "cluster_id"),`
`24`	`24`	`resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "instance_id"),`
	`25`	`+ resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_cluster_attachment.test_attach", "unschedulable"),`
`25`	`26`	`resource.TestCheckResourceAttr("tencentcloud_kubernetes_cluster_attachment.test_attach", "labels.test1", "test1"),`
`26`	`27`	`resource.TestCheckResourceAttr("tencentcloud_kubernetes_cluster_attachment.test_attach", "labels.test2", "test2"),`
`27`	`28`	`),`
`@@ -209,15 +210,13 @@ resource "tencentcloud_kubernetes_cluster_attachment" "test_attach" {`
`209`	`210`	`cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id`
`210`	`211`	`instance_id = tencentcloud_instance.foo.id`
`211`	`212`	`password = "Lo4wbdit"`
	`213`	`+ unschedulable = 0`
`212`	`214`
`213`	`215`	`labels = {`
`214`	`216`	`"test1" = "test1",`
`215`	`217`	`"test2" = "test2",`
`216`	`218`	`}`
`217`	`219`
`218`		`- extra_args = [`
`219`		`- "root-dir=/var/lib/kubelet"`
`220`		`- ]`
`221`	`220`	`}`
`222`	`221`	`
`223`	`222`	`}`