Merge pull request #655 from tencentcloudstack/feature/add-tke-cluster-runtime-version

feat: tke instance creation - add RuntimeVersion param

Author: Kagashino

CHANGELOG.md

@@ -1,7 +1,16 @@
-## 1.58.1 (Aug 17, 2021)
+## 1.58.2 (Aug 18, 2021)
 ENHANCEMENTS:
+* Resource `resource_tc_kubernetes_cluster.go` tke instance creation - add RuntimeVersion param
 * Resource `resource_tc_kubernetes_cluster.go` extend worker instance data disk mount settings
 
+## 1.58.1 (Aug 17, 2021)
+
+ENHANCEMENTS:
+* Resource `resource_tc_mysql_instance.go` add cpu params for mysql
+
+BUG_FIXES:
+* Resource `resource_tc_instance.go` fix read cvm data_disks bug
+
 ## 1.58.0 (Aug 11, 2021)
 
 FEATURES:

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -1134,6 +1134,11 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Elem:        &schema.Schema{Type: schema.TypeString},
 			Description: "Custom parameter information related to the node.",
 		},
+		"runtime_version": {
+			Type:		schema.TypeString,
+			Optional: true,
+			Description: "Container Runtime version.",
+		},
 
 		"kube_config": {
 			Type:        schema.TypeString,
@@ -1657,6 +1662,10 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 		}
 	}
 
+	if version, ok := d.GetOk("runtime_version"); ok {
+		advanced.RuntimeVersion = version.(string)
+	}
+
 	overrideSettings := OverrideSettings{
 		Master: make([]tke.InstanceAdvancedSettings, 0),
 		Work:   make([]tke.InstanceAdvancedSettings, 0),

tencentcloud/service_tencentcloud_tke.go

@@ -34,6 +34,7 @@ type ClusterAdvancedSettings struct {
 	EnableCustomizedPodCIDR bool
 	BasePodNumber           int64
 	ContainerRuntime        string
+	RuntimeVersion			string
 	NodeNameType            string
 	ExtraArgs               ClusterExtraArgs
 	NetworkType             string
@@ -435,6 +436,7 @@ func (me *TkeService) CreateCluster(ctx context.Context,
 	request.ClusterAdvancedSettings.IPVS = &advanced.Ipvs
 	request.ClusterAdvancedSettings.AsEnabled = &advanced.AsEnabled
 	request.ClusterAdvancedSettings.ContainerRuntime = &advanced.ContainerRuntime
+	request.ClusterAdvancedSettings.RuntimeVersion = &advanced.RuntimeVersion
 	request.ClusterAdvancedSettings.NodeNameType = &advanced.NodeNameType
 	request.ClusterAdvancedSettings.EnableCustomizedPodCIDR = &advanced.EnableCustomizedPodCIDR
 	request.ClusterAdvancedSettings.BasePodNumber = &advanced.BasePodNumber

website/docs/r/kubernetes_cluster.html.markdown

@@ -319,6 +319,7 @@ The following arguments are supported:
 * `node_name_type` - (Optional, ForceNew) Node name type of Cluster, the available values include: 'lan-ip' and 'hostname', Default is 'lan-ip'.
 * `node_pool_global_config` - (Optional) Global config effective for all node pools.
 * `project_id` - (Optional) Project ID, default value is 0.
+* `runtime_version` - (Optional) Container Runtime version.
 * `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.