Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 9 additions & 0 deletions tencentcloud/resource_tc_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions tencentcloud/service_tencentcloud_tke.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type ClusterAdvancedSettings struct {
EnableCustomizedPodCIDR bool
BasePodNumber int64
ContainerRuntime string
RuntimeVersion string
NodeNameType string
ExtraArgs ClusterExtraArgs
NetworkType string
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/kubernetes_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down