Merge pull request kubernetes#3102 from wccsama/EphemeralStorage

add EphemeralStorage in group template

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/baiducloud/baiducloud-sdk-go/cce/cluster.go

@@ -62,13 +62,14 @@ type CceCluster struct {
 
 // CceGroup defines autoscaling group
 type CceGroup struct {
-	InstanceType int    `json:"instanceType"`
-	CPU          int    `json:"cpu,omitempty"`
-	Memory       int    `json:"memory,omitempty"`
-	GpuCount     int    `json:"gpuCount,omitempty"`
-	GpuCard      string `json:"gpuCard,omitempty"`
-	DiskSize     int    `json:"diskSize,omitempty"`
-	Tags         []Tag  `json:"tags"`
+	InstanceType     int    `json:"instanceType"`
+	CPU              int    `json:"cpu,omitempty"`
+	Memory           int    `json:"memory,omitempty"`
+	GpuCount         int    `json:"gpuCount,omitempty"`
+	GpuCard          string `json:"gpuCard,omitempty"`
+	DiskSize         int    `json:"diskSize,omitempty"`
+	EphemeralStorage int    `json:"ephemeralStorage,omitempty"`
+	Tags             []Tag  `json:"tags"`
 }
 
 // Tag defines label

cluster-autoscaler/cloudprovider/baiducloud/baiducloud_manager.go

@@ -58,13 +58,14 @@ type asgInformation struct {
 }
 
 type asgTemplate struct {
-	InstanceType int
-	Region       string
-	Zone         string
-	CPU          int
-	Memory       int
-	GpuCount     int
-	Tags         map[string]string
+	InstanceType     int
+	Region           string
+	Zone             string
+	CPU              int
+	Memory           int
+	GpuCount         int
+	EphemeralStorage int
+	Tags             map[string]string
 }
 
 // CreateBaiducloudManager constructs baiducloudManager object.
@@ -230,12 +231,13 @@ func (m *BaiducloudManager) getAsgTemplate(name string) (*asgTemplate, error) {
 	}
 
 	return &asgTemplate{
-		InstanceType: cceGroup.InstanceType,
-		Region:       m.cloudConfig.Region,
-		CPU:          cceGroup.CPU,
-		Memory:       cceGroup.Memory,
-		GpuCount:     cceGroup.GpuCount,
-		Tags:         tags,
+		InstanceType:     cceGroup.InstanceType,
+		Region:           m.cloudConfig.Region,
+		CPU:              cceGroup.CPU,
+		Memory:           cceGroup.Memory,
+		GpuCount:         cceGroup.GpuCount,
+		EphemeralStorage: cceGroup.EphemeralStorage,
+		Tags:             tags,
 	}, nil
 }
 
@@ -258,6 +260,9 @@ func (m *BaiducloudManager) buildNodeFromTemplate(asg *Asg, template *asgTemplat
 
 	node.Status.Capacity[gpu.ResourceNvidiaGPU] = *resource.NewQuantity(int64(template.GpuCount), resource.DecimalSI)
 
+	// add ephemeral-storage
+	node.Status.Capacity[apiv1.ResourceEphemeralStorage] = *resource.NewQuantity(int64(template.EphemeralStorage*1024*1024*1024), resource.DecimalSI)
+
 	node.Status.Allocatable = node.Status.Capacity
 
 	node.Status.Conditions = cloudprovider.BuildReadyConditions()