Merge remote-tracking branch 'upstream/master' into feature/ssm

Author: ChrisdeR

CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.54.0 (Unreleased)
+## 1.54.2 (Unreleased)
+## 1.54.1 (March 24, 2021)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_tcr_vpc_attachment` add `enable_public_domain_dns`, `enable_vpc_domain_dns` to set whether to enable dns.
+* Data Source `tencentcloud_tcr_vpc_attachments` add `enable_public_domain_dns`, `enable_vpc_domain_dns`.
+
+## 1.54.0 (March 22, 2021)
 
 FEATURES:
 
@@ -10,6 +18,13 @@ FEATURES:
 * **New Data Source**: `tencentcloud_ssm_secrets` 
 * **New Data Source**: `tencentcloud_ssm_secret_versions` 
 
+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:

tencentcloud/connectivity/transport.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const ReqClient = "Terraform-v1.53.9"
+const ReqClient = "Terraform-v1.54.1"
 
 type LogRoundTripper struct {
 }

tencentcloud/data_source_tc_tcr_vpc_attachments.go

@@ -72,6 +72,16 @@ func dataSourceTencentCloudTCRVPCAttachments() *schema.Resource {
 							Computed:    true,
 							Description: "IP address of this VPC access.",
 						},
+						"enable_public_domain_dns": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Whether to enable public domain dns.",
+						},
+						"enable_vpc_domain_dns": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Whether to enable vpc domain dns.",
+						},
 					},
 				},
 			},
@@ -120,6 +130,19 @@ func dataSourceTencentCloudTCRVPCAttachmentsRead(d *schema.ResourceData, meta in
 			"status":    vpcAccess.Status,
 			"access_ip": vpcAccess.AccessIp,
 		}
+		if *vpcAccess.AccessIp != "" {
+			publicDomainDnsStatus, err := GetDnsStatus(ctx, tcrService, instanceId, *vpcAccess.VpcId, *vpcAccess.AccessIp, true)
+			if err != nil {
+				return err
+			}
+			mapping["enable_public_domain_dns"] = *publicDomainDnsStatus.Status == TCR_VPC_DNS_STATUS_ENABLED
+
+			vpcDomainDnsStatus, err := GetDnsStatus(ctx, tcrService, instanceId, *vpcAccess.VpcId, *vpcAccess.AccessIp, false)
+			if err != nil {
+				return err
+			}
+			mapping["enable_vpc_domain_dns"] = *vpcDomainDnsStatus.Status == TCR_VPC_DNS_STATUS_ENABLED
+		}
 
 		vpcAccessList = append(vpcAccessList, mapping)
 		ids = append(ids, instanceId+FILED_SP+*vpcAccess.VpcId+FILED_SP+*vpcAccess.SubnetId)

tencentcloud/extension_tcr.go

@@ -0,0 +1,6 @@
+package tencentcloud
+
+const (
+	TCR_VPC_DNS_STATUS_ENABLED  = "ENABLED"
+	TCR_VPC_DNS_STATUS_DISABLED = "DISABLED"
+)

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 {

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",

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)
 	}

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)

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"
-  ]
 }
 `
 }

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",