Merge pull request kubernetes#3621 from RainbowMango/pr_implement_asg

CA huaweicloud: implements node group by AS

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/huaweicloud/examples/cluster-autoscaler-secret.yaml

@@ -9,6 +9,8 @@ stringData:
   cloud-config: |-
     [Global]
     identity-endpoint=https://{Identity Endpoint}/v3.0
+    ecs-endpoint=https://{ECS endpoint}
+    as-endpoint=https://{AS endpoint}
     project-id={Project ID}
     access-key={Access Key}
     secret-key={Secret Key}

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_auto_scaling_group.go

@@ -21,22 +21,33 @@ import (
 
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
+	huaweicloudsdkasmodel "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/services/as/v1/model"
 	"k8s.io/klog/v2"
 	schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 )
 
 // AutoScalingGroup represents a HuaweiCloud's 'Auto Scaling Group' which also can be treated as a node group.
 type AutoScalingGroup struct {
 	cloudServiceManager CloudServiceManager
-
-	groupID           string
-	minInstanceNumber int
-	maxInstanceNumber int
+	groupName           string
+	groupID             string
+	minInstanceNumber   int
+	maxInstanceNumber   int
 }
 
 // Check if our AutoScalingGroup implements necessary interface.
 var _ cloudprovider.NodeGroup = &AutoScalingGroup{}
 
+func newAutoScalingGroup(csm CloudServiceManager, sg huaweicloudsdkasmodel.ScalingGroups) AutoScalingGroup {
+	return AutoScalingGroup{
+		cloudServiceManager: csm,
+		groupName:           *sg.ScalingGroupName,
+		groupID:             *sg.ScalingGroupId,
+		minInstanceNumber:   int(*sg.MinInstanceNumber),
+		maxInstanceNumber:   int(*sg.MaxInstanceNumber),
+	}
+}
+
 // MaxSize returns maximum size of the node group.
 func (asg *AutoScalingGroup) MaxSize() int {
 	return asg.maxInstanceNumber
@@ -92,7 +103,7 @@ func (asg *AutoScalingGroup) DeleteNodes(nodes []*apiv1.Node) error {
 
 	servers := make([]string, 0, len(instances))
 	for _, instance := range instances {
-		servers = append(servers, *instance.InstanceId)
+		servers = append(servers, instance.Id)
 	}
 
 	err = asg.cloudServiceManager.DeleteServers(servers)
@@ -101,6 +112,8 @@ func (asg *AutoScalingGroup) DeleteNodes(nodes []*apiv1.Node) error {
 		return err
 	}
 
+	// TODO(RainbowMango): Wait for node group size updated.
+
 	return nil
 }
 
@@ -134,21 +147,8 @@ func (asg *AutoScalingGroup) Nodes() ([]cloudprovider.Instance, error) {
 		klog.Warningf("failed to get nodes from group: %s, error: %v", asg.groupID, err)
 		return nil, err
 	}
-	if len(instances) == 0 {
-		return nil, nil
-	}
 
-	// TODO(RainbowMango) Convert AS instances to cloud provider instances. Especially convert status.
-	providerInstances := make([]cloudprovider.Instance, 0, len(instances))
-	for i := range instances {
-		pInstances := cloudprovider.Instance{
-			Id:     *instances[i].InstanceId,
-			Status: nil,
-		}
-
-		providerInstances = append(providerInstances, pInstances)
-	}
-	return nil, nil
+	return instances, nil
 }
 
 // TemplateNodeInfo returns a schedulerframework.NodeInfo structure of an empty

cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_cloud_config.go

@@ -17,13 +17,25 @@ limitations under the License.
 package huaweicloud
 
 import (
+	"fmt"
+	"io"
+	"os"
+
+	"gopkg.in/gcfg.v1"
+	huaweicloudsdkbasic "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic"
+	huaweicloudsdkconfig "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/core/config"
+	huaweicloudsdkas "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/services/as/v1"
+	huaweicloudsdkecs "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud-sdk-go-v3/services/ecs/v2"
+
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/huaweicloud/huawei-cloud-sdk-go/auth/aksk"
 )
 
 // CloudConfig is the cloud config file for huaweicloud.
 type CloudConfig struct {
 	Global struct {
 		IdentityEndpoint string `gcfg:"identity-endpoint"` // example: "https://iam.cn-north-4.myhuaweicloud.com/v3.0"
+		ECSEndpoint      string `gcfg:"ecs-endpoint"`
+		ASEndpoint       string `gcfg:"as-endpoint"`
 		ProjectID        string `gcfg:"project-id"`
 		AccessKey        string `gcfg:"access-key"`
 		SecretKey        string `gcfg:"secret-key"`
@@ -33,6 +45,69 @@ type CloudConfig struct {
 	}
 }
 
+func (c *CloudConfig) getECSClient() *huaweicloudsdkecs.EcsClient {
+	// There are two types of services provided by HUAWEI CLOUD according to scope:
+	// - Regional services: most of services belong to this classification, such as ECS.
+	// - Global services: such as IAM, TMS, EPS.
+	// For Regional services' authentication, projectId is required.
+	// For global services' authentication, domainId is required.
+	// More details please refer to:
+	// https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/0281b9734f0f95ed5565729e54d96e9820262426/README.md#use-go-sdk
+	credentials := huaweicloudsdkbasic.NewCredentialsBuilder().
+		WithAk(c.Global.AccessKey).
+		WithSk(c.Global.SecretKey).
+		WithProjectId(c.Global.ProjectID).
+		Build()
+
+	client := huaweicloudsdkecs.EcsClientBuilder().
+		WithEndpoint(c.Global.ECSEndpoint).
+		WithCredential(credentials).
+		WithHttpConfig(huaweicloudsdkconfig.DefaultHttpConfig()).
+		Build()
+
+	return huaweicloudsdkecs.NewEcsClient(client)
+}
+
+func (c *CloudConfig) getASClient() *huaweicloudsdkas.AsClient {
+	credentials := huaweicloudsdkbasic.NewCredentialsBuilder().
+		WithAk(c.Global.AccessKey).
+		WithSk(c.Global.SecretKey).
+		WithProjectId(c.Global.ProjectID).
+		Build()
+
+	client := huaweicloudsdkas.AsClientBuilder().
+		WithEndpoint(c.Global.ASEndpoint).
+		WithCredential(credentials).
+		WithHttpConfig(huaweicloudsdkconfig.DefaultHttpConfig()).
+		Build()
+
+	return huaweicloudsdkas.NewAsClient(client)
+}
+
+func (c *CloudConfig) validate() error {
+	if len(c.Global.ECSEndpoint) == 0 {
+		return fmt.Errorf("ECS endpoint missing from cloud configuration")
+	}
+
+	if len(c.Global.ASEndpoint) == 0 {
+		return fmt.Errorf("AS endpoint missing from cloud configuration")
+	}
+
+	if len(c.Global.AccessKey) == 0 {
+		return fmt.Errorf("access key missing from cloud coniguration")
+	}
+
+	if len(c.Global.SecretKey) == 0 {
+		return fmt.Errorf("secret key missing from cloud configuration")
+	}
+
+	if len(c.Global.ProjectID) == 0 {
+		return fmt.Errorf("project id missing from cloud configuration")
+	}
+
+	return nil
+}
+
 // toAKSKOptions creates and returns a new instance of type aksk.AKSKOptions
 func toAKSKOptions(cfg CloudConfig) aksk.AKSKOptions {
 	opts := aksk.AKSKOptions{
@@ -46,3 +121,19 @@ func toAKSKOptions(cfg CloudConfig) aksk.AKSKOptions {
 	}
 	return opts
 }
+
+func readConf(confFile string) (*CloudConfig, error) {
+	var conf io.ReadCloser
+	conf, err := os.Open(confFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open configuration file: %s, error: %v", confFile, err)
+	}
+	defer conf.Close()
+
+	var cloudConfig CloudConfig
+	if err := gcfg.ReadInto(&cloudConfig, conf); err != nil {
+		return nil, fmt.Errorf("failed to read configuration file: %s, error: %v", confFile, err)
+	}
+
+	return &cloudConfig, nil
+}