Merge pull request #19 from deckhouse/add-cluster-info

Add clusterUUID as label to newly created disks
deckhouse · Apr 23, 2024 · d7c17ce · d7c17ce
2 parents 565ebf2 + 99eeae9
commit d7c17ce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.52.2
+          version: v1.55.2
           args: --timeout=5m
   build:
     runs-on: ubuntu-latest

diff --git a/cmd/yandex-csi-driver/main.go b/cmd/yandex-csi-driver/main.go
@@ -31,11 +31,12 @@ import (
 
 func main() {
 	var (
-		endpoint   = flag.String("endpoint", "unix:///var/lib/kubelet/plugins/"+driver.DefaultDriverName+"/csi.sock", "CSI endpoint")
-		folderID   = flag.String("folder-id", "", "Folder ID")
-		driverName = flag.String("driver-name", driver.DefaultDriverName, "Name for the driver")
-		address    = flag.String("address", driver.DefaultAddress, "Address to serve on")
-		version    = flag.Bool("version", false, "Print the version and exit.")
+		endpoint    = flag.String("endpoint", "unix:///var/lib/kubelet/plugins/"+driver.DefaultDriverName+"/csi.sock", "CSI endpoint")
+		folderID    = flag.String("folder-id", "", "Folder ID")
+		driverName  = flag.String("driver-name", driver.DefaultDriverName, "Name for the driver")
+		address     = flag.String("address", driver.DefaultAddress, "Address to serve on")
+		clusterUUID = flag.String("cluster-uuid", driver.DefaultClusterUUID, "Cluster UUID")
+		version     = flag.Bool("version", false, "Print the version and exit.")
 	)
 	flag.Parse()
 
@@ -46,7 +47,7 @@ func main() {
 
 	authKeys := os.Getenv("YANDEX_AUTH_KEYS")
 
-	drv, err := driver.NewDriver(*endpoint, authKeys, *folderID, *driverName, *address)
+	drv, err := driver.NewDriver(*endpoint, authKeys, *folderID, *driverName, *address, *clusterUUID)
 	if err != nil {
 		log.Fatalln(err)
 	}

diff --git a/driver/controller.go b/driver/controller.go
@@ -173,6 +173,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		FolderId:    d.folderID,
 		Name:        volumeName,
 		Description: createdByYandex,
+		Labels:      map[string]string{"cluster_uuid": d.clusterUUID},
 		TypeId:      typeID,
 		ZoneId:      zone,
 		Size:        size,

diff --git a/driver/driver.go b/driver/driver.go
@@ -48,6 +48,7 @@ const (
 	// DefaultAddress is the default address that the csi plugin will serve its
 	// http handler on.
 	DefaultAddress           = "127.0.0.1:12302"
+	DefaultClusterUUID       = "default"
 	defaultWaitActionTimeout = 5 * time.Minute
 )
 
@@ -59,10 +60,9 @@ var (
 
 // Driver implements the following CSI interfaces:
 //
-//   csi.IdentityServer
-//   csi.ControllerServer
-//   csi.NodeServer
-//
+//	csi.IdentityServer
+//	csi.ControllerServer
+//	csi.NodeServer
 type Driver struct {
 	name string
 	// publishInfoVolumeName is used to pass the volume name from
@@ -78,6 +78,8 @@ type Driver struct {
 	region string
 	zone   string
 
+	clusterUUID string
+
 	srv         *grpc.Server
 	httpSrv     http.Server
 	log         *logrus.Entry
@@ -109,7 +111,7 @@ func (d *Driver) ListSnapshots(context.Context, *csi.ListSnapshotsRequest) (*csi
 // NewDriver returns a CSI plugin that contains the necessary gRPC
 // interfaces to interact with Kubernetes over unix domain sockets for
 // managaing Yandex Disks
-func NewDriver(ep, authKeysStr, folderID, driverName, address string) (*Driver, error) {
+func NewDriver(ep, authKeysStr, folderID, driverName, address, clusterUUID string) (*Driver, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
@@ -170,6 +172,8 @@ func NewDriver(ep, authKeysStr, folderID, driverName, address string) (*Driver,
 		resizeLocks:       NewRwMap(),
 		waitActionTimeout: defaultWaitActionTimeout,
 
+		clusterUUID: clusterUUID,
+
 		sdk: sdk,
 
 		healthChecker: healthChecker,