diff --git a/tencentcloud/data_source_tc_kubernetes_charts_test.go b/tencentcloud/data_source_tc_kubernetes_charts_test.go index 3a54bd898e..fa32b83548 100644 --- a/tencentcloud/data_source_tc_kubernetes_charts_test.go +++ b/tencentcloud/data_source_tc_kubernetes_charts_test.go @@ -23,8 +23,7 @@ func TestAccTencentCloudKubernetesChartsDataSource(t *testing.T) { }) } - const testAccDataSourceKubernetesCharts = ` data "tencentcloud_kubernetes_charts" "test" { } -` \ No newline at end of file +` diff --git a/tencentcloud/extension_tke.go b/tencentcloud/extension_tke.go index fbec26fd57..5c4497df17 100644 --- a/tencentcloud/extension_tke.go +++ b/tencentcloud/extension_tke.go @@ -119,4 +119,4 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{ "global.cluster.clustertype", "global.cluster.kubeversion", "global.cluster.kubeminor", -} \ No newline at end of file +} diff --git a/tencentcloud/resource_tc_kubernetes_addon_attachment.go b/tencentcloud/resource_tc_kubernetes_addon_attachment.go index 0471d6f56c..9352d43a5c 100644 --- a/tencentcloud/resource_tc_kubernetes_addon_attachment.go +++ b/tencentcloud/resource_tc_kubernetes_addon_attachment.go @@ -34,6 +34,10 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" { "global.imagePullSecretsCrs[1].dockerUsername=100012345678", "global.imagePullSecretsCrs[1].dockerPassword=a.b.tcr-token", "global.imagePullSecretsCrs[1].dockerServer=sample", + # Specify global hosts + "global.hosts[0].domain=sample-vpc.tencentcloudcr.com", + "global.hosts[0].ip=10.16.0.49", + "global.hosts[0].disabled=false", ] } ``` @@ -121,9 +125,9 @@ func resourceTencentCloudTkeAddonAttachment() *schema.Resource { Description: "Addon response body.", }, "status": { - Type: schema.TypeMap, - Computed: true, - Description: "Addon current status.", + Type: schema.TypeMap, + Computed: true, + Description: "Addon current status.", }, }, Create: resourceTencentCloudTkeAddonAttachmentCreate, @@ -209,13 +213,12 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int addonName := split[1] var ( - err error - response string + err error + response string addonResponseData = &AddonResponseData{} - status = make(map[string]*string) + status = make(map[string]*string) ) - _, has, err = service.PollingAddonsPhase(ctx, clusterId, addonName, addonResponseData) if err != nil || !has { @@ -300,7 +303,7 @@ func resourceTencentCloudTkeAddonAttachmentDelete(d *schema.ResourceData, meta i split = strings.Split(id, FILED_SP) clusterId = split[0] addonName = split[1] - has bool + has bool ) if err := service.DeleteExtensionAddon(ctx, clusterId, addonName); err != nil { @@ -330,4 +333,4 @@ func getFilteredValues(d *schema.ResourceData, values []*string) []string { rawValues = append(rawValues, *value) } return rawValues -} \ No newline at end of file +} diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go index 1baa5e8883..7a98092e56 100644 --- a/tencentcloud/resource_tc_kubernetes_cluster.go +++ b/tencentcloud/resource_tc_kubernetes_cluster.go @@ -993,9 +993,9 @@ func resourceTencentCloudTkeCluster() *schema.Resource { Description: "Vpc Id of the cluster.", }, "cluster_internet": { - Type: schema.TypeBool, - Default: false, - Optional: true, + Type: schema.TypeBool, + Default: false, + Optional: true, Description: "Open internet access or not." + " If this field is set 'true', the field below `worker_config` must be set." + " Because only cluster with node is allowed enable access endpoint.", diff --git a/tencentcloud/resource_tc_redis_instance.go b/tencentcloud/resource_tc_redis_instance.go index 71628891a1..c716a98bb6 100644 --- a/tencentcloud/resource_tc_redis_instance.go +++ b/tencentcloud/resource_tc_redis_instance.go @@ -160,10 +160,10 @@ func resourceTencentCloudRedisInstance() *schema.Resource { Description: "Password for a Redis user, which should be 8 to 16 characters. NOTE: Only `no_auth=true` specified can make password empty.", }, "no_auth": { - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.", + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.", }, "mem_size": { Type: schema.TypeInt, diff --git a/website/docs/r/kubernetes_addon_attachment.html.markdown b/website/docs/r/kubernetes_addon_attachment.html.markdown index 7115f88784..186311e344 100644 --- a/website/docs/r/kubernetes_addon_attachment.html.markdown +++ b/website/docs/r/kubernetes_addon_attachment.html.markdown @@ -43,6 +43,10 @@ resource "tencentcloud_kubernetes_addon_attachment" "addon_tcr" { "global.imagePullSecretsCrs[1].dockerUsername=100012345678", "global.imagePullSecretsCrs[1].dockerPassword=a.b.tcr-token", "global.imagePullSecretsCrs[1].dockerServer=sample", + # Specify global hosts + "global.hosts[0].domain=sample-vpc.tencentcloudcr.com", + "global.hosts[0].ip=10.16.0.49", + "global.hosts[0].disabled=false", ] } ```