Merge pull request #1560 from mowangdk/feature/support_lingjun_ebs_volume_count

Add max ebs volume count for lingjun node

Author: k8s-ci-robot

docs/ram-policies/disk/node.json

@@ -17,7 +17,9 @@
                 "ecs:ListTagResources",
                 "ecs:RemoveTags",
                 "ecs:TagResources",
-                "ecs:UntagResources"
+                "ecs:UntagResources",
+                "eflo:DescribeNode",
+                "eflo:DescribeNodeType"
             ],
             "Resource": [
                 "*"

go.mod

@@ -4,11 +4,11 @@ go 1.24.0
 
 require (
 	github.com/alibabacloud-go/darabonba-openapi v0.1.16
-	github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12
-	github.com/alibabacloud-go/eflo-controller-20221215/v2 v2.7.0
+	github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.13
+	github.com/alibabacloud-go/eflo-controller-20221215/v3 v3.0.0
 	github.com/alibabacloud-go/ens-20171110/v3 v3.0.2
 	github.com/alibabacloud-go/nas-20170626/v4 v4.1.2
-	github.com/alibabacloud-go/tea v1.3.12
+	github.com/alibabacloud-go/tea v1.3.13
 	github.com/aliyun/alibaba-cloud-sdk-go v1.63.107
 	github.com/aliyun/credentials-go v1.4.8
 	github.com/container-storage-interface/spec v1.10.0

go.sum

@@ -31,9 +31,9 @@ github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIp
 github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc=
 github.com/alibabacloud-go/darabonba-openapi v0.1.16 h1:f6ZspWKTBurQzyLpZKMVxO51HAePY8aedicwuX3+E20=
 github.com/alibabacloud-go/darabonba-openapi v0.1.16/go.mod h1:ZjyqRbbZOaUBSh7keeH8VQN/BzCPvxCQwMuJGDdbmXQ=
-github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11/go.mod h1:ue0+WkdPxpCB2JP3iaG4Iawayxp72kyT5uDbozQKaW8=
-github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12 h1:e2yCrhtWd6Qcsy4he2OL+jIAU+93Lx9OcLlPRoFLT1w=
 github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12/go.mod h1:f2wDpbM7hK9SvLIH09zSKVU1TsyemUNOqErMscMMl7c=
+github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.13 h1:Q00FU3H94Ts0ZIHDmY+fYGgB7dV9D/YX6FGsgorQPgw=
+github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.13/go.mod h1:lxFGfobinVsQ49ntjpgWghXmIF0/Sm4+wvBJ1h5RtaE=
 github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg=
 github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ=
 github.com/alibabacloud-go/darabonba-string v1.0.0/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA=
@@ -43,8 +43,8 @@ github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6p
 github.com/alibabacloud-go/debug v1.0.0/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc=
 github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA6GSbPg=
 github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc=
-github.com/alibabacloud-go/eflo-controller-20221215/v2 v2.7.0 h1:gWbU9RrpLn+YwRCiWMOL/2UgKmuZ3Xqa6SWPV0t25u4=
-github.com/alibabacloud-go/eflo-controller-20221215/v2 v2.7.0/go.mod h1:9mZf3f2MQl8jEVX7CPBp0wD8Uxh6ifCyWqRZvtqfnA8=
+github.com/alibabacloud-go/eflo-controller-20221215/v3 v3.0.0 h1:pZLIXOMPzHy49K891UCgwC4ihgoUYnTwvK4VIExkwzs=
+github.com/alibabacloud-go/eflo-controller-20221215/v3 v3.0.0/go.mod h1:SKN9dFS7vtPV1hfeLYE0iu4lB8OiFWz/4lq6FRkdapc=
 github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q=
 github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE=
 github.com/alibabacloud-go/ens-20171110/v3 v3.0.2 h1:MOcjqAf7cACXaPKAv37WMjp7zHARcrdmGQm08PYiiPM=
@@ -63,9 +63,9 @@ github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/Ke
 github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
 github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
 github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
-github.com/alibabacloud-go/tea v1.3.11/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
-github.com/alibabacloud-go/tea v1.3.12 h1:ir2Io80UlBy1JHf7t+uCTxmaGQtiEta1WpV29NGJTkE=
 github.com/alibabacloud-go/tea v1.3.12/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
+github.com/alibabacloud-go/tea v1.3.13 h1:WhGy6LIXaMbBM6VBYcsDCz6K/TPsT1Ri2hPmmZffZ94=
+github.com/alibabacloud-go/tea v1.3.13/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
 github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
 github.com/alibabacloud-go/tea-utils v1.4.3 h1:8SzwmmRrOnQ09Hf5a9GyfJc0d7Sjv6fmsZoF4UDbFjo=
 github.com/alibabacloud-go/tea-utils v1.4.3/go.mod h1:KNcT0oXlZZxOXINnZBs6YvgOd5aYp9U67G+E3R8fcQw=

pkg/bmcpfs/controllerserver.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
-	efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v2/client"
+	efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v3/client"
 	nasclient "github.com/alibabacloud-go/nas-20170626/v4/client"
 	"github.com/alibabacloud-go/tea/tea"
 	alicred_old "github.com/aliyun/credentials-go/credentials"
@@ -122,6 +122,7 @@ func (cs *controllerServer) ControllerPublishVolume(ctx context.Context, req *cs
 			if req.VolumeContext[_vpcMountTarget] == "" {
 				return nil, status.Errorf(codes.InvalidArgument, "missing %q config in volume context as vsc mountpoint not supported", _vpcMountTarget)
 			}
+			klog.InfoS("ControllerPublishVolume: vsc mountpoint not supported, switch to vpc mountpoint", "nodeId", req.NodeId, "mt", mt)
 			return &csi.ControllerPublishVolumeResponse{
 				PublishContext: map[string]string{
 					_networkType:    networkTypeVPC,

pkg/bmcpfs/internal/vsc.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v2/client"
+	efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v3/client"
 	nasclient "github.com/alibabacloud-go/nas-20170626/v4/client"
 	"github.com/alibabacloud-go/tea/tea"
 	"golang.org/x/time/rate"

pkg/cloud/eflointerface.go

@@ -0,0 +1,10 @@
+package cloud
+
+import (
+	eflo "github.com/alibabacloud-go/eflo-controller-20221215/v3/client"
+)
+
+type EFLOInterface interface {
+	DescribeNodeType(req *eflo.DescribeNodeTypeRequest) (*eflo.DescribeNodeTypeResponse, error)
+	DescribeNode(request *eflo.DescribeNodeRequest) (*eflo.DescribeNodeResponse, error)
+}

pkg/cloud/eflomock.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 	"time"
 
+	efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v3/client"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 	snapClientset "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud/metadata"
@@ -68,6 +69,7 @@ type DISK struct {
 // GlobalConfig save global values for plugin
 type GlobalConfig struct {
 	EcsClient            *ecs.Client
+	EfloClient           *efloclient.Client
 	Region               string
 	NodeID               string
 	DiskTagEnable        bool
@@ -126,6 +128,11 @@ func NewDriver(m metadata.MetadataProvider, endpoint string, serviceType utils.S
 	}
 	client := newEcsClient(metadata.MustGet(m, metadata.RegionID), credentials.V1ProviderAdaptor(cred))
 	GlobalConfigVar.EcsClient = client
+	efloClient, err := newEfloClient(metadata.MustGet(m, metadata.RegionID))
+	if err != nil {
+		klog.Fatalf("Error building eflo client: %s", err.Error())
+	}
+	GlobalConfigVar.EfloClient = efloClient
 
 	// Create GRPC servers
 	var servers common.Servers

pkg/disk/disk.go

@@ -829,19 +829,24 @@ func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque
 		return node, err
 	}
 
+	lingjunID := getLingjunNodeID()
+
 	c := GlobalConfigVar.EcsClient
+	efloc := GlobalConfigVar.EfloClient
 	if maxVolumesNum == 0 {
-		maxVolumesNum, err = getVolumeCountFromOpenAPI(getNode, c, ns.metadata, utilsio.RealDevTmpFS{})
+		maxVolumesNum, err = getVolumeCountFromOpenAPI(getNode, c, efloc, ns.metadata, utilsio.RealDevTmpFS{}, lingjunID)
 	} else {
 		node, err = getNode()
 	}
 	if err != nil {
 		return nil, err
 	}
+
 	var diskTypes []string
 	if !GlobalConfigVar.DiskAllowAllType {
 		// If it's a Lingjun node, reuse Lingjun detection and report configured supported types
-		if isLingjunNode(node) {
+		if lingjunID != "" {
+			klog.InfoS("lingjun node detected", "lingjunID", lingjunID)
 			ebsCategory := os.Getenv("EBS_CATEGORY_LINGJUN_SUPPORTED")
 			// Prefer values parsed from kube-system/csi-plugin configmap
 			diskTypes = parseLingjunNodeDiskTypes(ebsCategory)
@@ -886,6 +891,14 @@ func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque
 		segments[v1.LabelTopologyZone] = metadata.MustGet(ns.metadata, metadata.ZoneID)
 	}
 
+	// disable disk allocation when maxVolumesNum is 0
+	// events:
+	// Warning  ProvisioningFailed  diskplugin.csi.alibabacloud.com_csi-provisioner
+	// failed to provision volume with StorageClass "alicloud-disk-essd": error generating accessibility requirements: no available topology found
+	if maxVolumesNum == 0 {
+		segments = map[string]string{}
+	}
+
 	return &csi.NodeGetInfoResponse{
 		NodeId:             ns.NodeID,
 		MaxVolumesPerNode:  int64(maxVolumesNum),