feat(tencent): Support spot instance for tencent provider

cnrancher · Apr 7, 2022 · c2a0e6d · c2a0e6d
1 parent a687d98
commit c2a0e6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/pkg/providers/tencent/flag.go b/pkg/providers/tencent/flag.go
@@ -235,6 +235,13 @@ func (p *Tencent) sharedFlags() []types.Flag {
 			Usage:  "Specify the type of VM instance, see: https://cloud.tencent.com/document/product/213/11518",
 			EnvVar: "CVM_INSTANCE_TYPE",
 		},
+		{
+			Name:   "instance-charge-type",
+			P:      &p.InstanceChargeType,
+			V:      p.InstanceChargeType,
+			Usage:  "Specify the charge type of VM instance, see: https://cloud.tencent.com/document/product/213/15730",
+			EnvVar: "CVM_INSTANCE_CHARGE_TYPE",
+		},
 		{
 			Name:   "disk-category",
 			P:      &p.SystemDiskType,

diff --git a/pkg/providers/tencent/tencent.go b/pkg/providers/tencent/tencent.go
@@ -90,6 +90,7 @@ func newProvider() *Tencent {
 		Options: tencent.Options{
 			ImageID:                 imageID,
 			InstanceType:            instanceType,
+			InstanceChargeType:      instanceChargeType,
 			SystemDiskSize:          diskSize,
 			SystemDiskType:          diskCategory,
 			InternetMaxBandwidthOut: internetMaxBandwidthOut,
@@ -747,7 +748,7 @@ func (p *Tencent) runInstances(num int, master bool, password string) error {
 	request.Placement = &cvm.Placement{
 		Zone: tencentCommon.StringPtr(p.Zone),
 	}
-	request.InstanceChargeType = tencentCommon.StringPtr(instanceChargeType)
+	request.InstanceChargeType = tencentCommon.StringPtr(p.InstanceChargeType)
 	request.SecurityGroupIds = tencentCommon.StringPtrs(strings.Split(p.SecurityGroupIds, ","))
 	request.VirtualPrivateCloud = &cvm.VirtualPrivateCloud{
 		SubnetId: tencentCommon.StringPtr(p.SubnetID),

diff --git a/pkg/types/tencent/tencent.go b/pkg/types/tencent/tencent.go
@@ -32,6 +32,7 @@ type Options struct {
 	SubnetID                string   `json:"subnet,omitempty" yaml:"subnet,omitempty"`
 	ImageID                 string   `json:"image,omitempty" yaml:"image,omitempty"`
 	InstanceType            string   `json:"instance-type,omitempty" yaml:"instance-type,omitempty"`
+	InstanceChargeType      string   `json:"instance-charge-type,omitempty" yaml:"instance-charge-type,omitempty"`
 	SystemDiskType          string   `json:"disk-category,omitempty" yaml:"disk-category,omitempty"`
 	SystemDiskSize          string   `json:"disk-size,omitempty" yaml:"disk-size,omitempty"`
 	InternetMaxBandwidthOut string   `json:"internet-max-bandwidth-out,omitempty" yaml:"internet-max-bandwidth-out,omitempty"`