Merge pull request #143 from qiangzii/master

add plg support for create lb

Author: yongchuanzhou

Makefile

@@ -2,7 +2,7 @@
 # GitHub viewer defaults to 8, change with ?ts=4 in URL
 
 GIT_REPOSITORY= github.com/yunify/qingcloud-cloud-controller-manager
-IMG?= qingcloud/cloud-controller-manager:v1.4.20
+IMG?= qingcloud/cloud-controller-manager:v1.4.21
 #Debug level: 0, 1, 2 (1 true, 2 use bash)
 DEBUG?= 0
 DOCKERFILE?= deploy/Dockerfile

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/yunify/qingcloud-sdk-go v0.0.0-20250120063512-895f1d8507aa
+	github.com/yunify/qingcloud-sdk-go v0.0.0-20250417083958-b5f7eb82df62
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.21.1
 	k8s.io/apimachinery v0.21.1

go.sum

@@ -382,6 +382,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yunify/qingcloud-sdk-go v0.0.0-20250120063512-895f1d8507aa h1:AJ2wQoxVo8QmwVI3lJFjf0eEwmToHBzfLBRf/rGEMPg=
 github.com/yunify/qingcloud-sdk-go v0.0.0-20250120063512-895f1d8507aa/go.mod h1:OfwXDPSOiv0Si+1iyH8+JDPPApt73Em03muEf9iKM+c=
+github.com/yunify/qingcloud-sdk-go v0.0.0-20250417083958-b5f7eb82df62 h1:iMjV/kc1SRvWXK/84wzi08yYTtgatr9aKRvBW+NzhZU=
+github.com/yunify/qingcloud-sdk-go v0.0.0-20250417083958-b5f7eb82df62/go.mod h1:OfwXDPSOiv0Si+1iyH8+JDPPApt73Em03muEf9iKM+c=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=

pkg/apis/types.go

@@ -37,6 +37,7 @@ type LoadBalancerSpec struct {
 	VxNetID    *string   `json:"vxnet_id" name:"vxnet_id"`
 
 	SecurityGroups *string `json:"securityGroups" name:"securityGroups"`
+	PlaceGroupID   *string `json:"place_group_id" name:"place_group_id"`
 }
 
 type LoadBalancerStatus struct {

pkg/executor/lb.go

@@ -168,6 +168,7 @@ func (q *QingCloudClient) CreateLB(input *apis.LoadBalancer) (*apis.LoadBalancer
 		NodeCount:        input.Spec.NodeCount,
 		VxNet:            input.Spec.VxNetID,
 		SecurityGroup:    input.Spec.SecurityGroups,
+		PlaceGroupID:     input.Spec.PlaceGroupID,
 	}
 	if len(input.Spec.PrivateIPs) > 0 {
 		inputLB.PrivateIP = input.Spec.PrivateIPs[0]

pkg/qingcloud/annotations.go

@@ -109,6 +109,7 @@ type LoadBalancerConfig struct {
 	LoadBalancerType *int
 	NodeCount        *int
 	InternalIP       *string
+	PlaceGroupID     *string
 
 	//listener attrs
 	healthyCheckMethod *string
@@ -183,6 +184,10 @@ func (qc *QingCloud) ParseServiceLBConfig(cluster string, service *v1.Service) (
 	if internalReuseID, ok := annotation[ServiceAnnotationLoadBalancerInternalReuseID]; ok {
 		config.InternalReuseID = &internalReuseID
 	}
+	//plg
+	if qc.Config.PlaceGroupID != "" {
+		config.PlaceGroupID = qcservice.String(qc.Config.PlaceGroupID)
+	}
 
 	//listener annotation
 	if healthyCheckMethod, ok := annotation[ServiceAnnotationListenerHealthyCheckMethod]; ok {

pkg/qingcloud/qingcloud.go

@@ -41,6 +41,7 @@ type Config struct {
 	IsApp             bool     `yaml:"isApp,omitempty"`
 	TagIDs            []string `yaml:"tagIDs,omitempty"`
 	InstanceIDs       []string `yaml:"instanceIDs,omitempty"`
+	PlaceGroupID      string   `yaml:"placeGroupID,omitempty"`
 }
 
 // A single Kubernetes cluster can run in multiple zones,
@@ -211,8 +212,8 @@ func (qc *QingCloud) ensureLoadBalancer(ctx context.Context, _ string, service *
 	klog.V(4).Infof("EnsureLoadBalancer lb %s config %s", spew.Sdump(lb), spew.Sdump(conf))
 	if err != nil {
 		if errors.IsResourceNotFound(err) && conf.Policy != ReuseExistingLB && conf.Policy != Shared {
-			// will auto create lb with assigned eip
-			klog.Infof("lb not found for service %s/%s, going to create lb with assigned eip ", service.Namespace, service.Name)
+			// will auto create lb with assigned eip or vxnet
+			klog.Infof("lb not found for service %s/%s, going to create lb with assigned eip or vxnet ", service.Namespace, service.Name)
 		} else {
 			return nil, fmt.Errorf("getLoadBalancer error: %v", err)
 		}
@@ -339,6 +340,7 @@ func (qc *QingCloud) ensureLoadBalancer(ctx context.Context, _ string, service *
 				VxNetID:          conf.VxNetID,
 				PrivateIPs:       []*string{conf.InternalIP},
 				EIPs:             conf.EipIDs,
+				PlaceGroupID:     conf.PlaceGroupID,
 			},
 		})
 		if err != nil {