fix topology

LuxChanLu · May 27, 2023 · 87cada3 · 87cada3
1 parent 04fa377
commit 87cada3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ metadata:
   name: storage-libvirt-xfs-retain
 provisioner: lu.lxc.csi.libvirt
 parameters:
-  fstype: xfs
+  csi.storage.k8s.io/fstype: xfs
   pool: pool
   bus: virtio # virtio/usb/sata/ide
 reclaimPolicy: Retain

diff --git a/charts/libvirt-csi/templates/controller.yaml b/charts/libvirt-csi/templates/controller.yaml
@@ -38,6 +38,7 @@ spec:
           image: registry.k8s.io/sig-storage/csi-provisioner:v3.4.0
           args:
             - "--csi-address=$(ADDRESS)"
+            - "--feature-gates=Topology=true"
             - "--default-fstype=ext4"
             - "--v=5"
           env:

diff --git a/charts/libvirt-csi/templates/node.yaml b/charts/libvirt-csi/templates/node.yaml
@@ -152,7 +152,7 @@ rules:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-libvirt-node-driver-read-node-labels
+  name: csi-libvirt-node-driver-read-node-labels-role
   namespace: kube-system
 rules:
   - apiGroups: [""]

diff --git a/internal/provider/csi/controller/controller.go b/internal/provider/csi/controller/controller.go
@@ -99,6 +99,9 @@ func (c *Controller) ControllerGetVolume(ctx context.Context, request *csi.Contr
 	if err != nil {
 		return nil, status.Error(codes.NotFound, fmt.Sprintf("unable to get libvirt instance: %s, %s", zone, err.Error()))
 	}
+	if zone != "" {
+		response.Volume.AccessibleTopology = []*csi.Topology{{Segments: map[string]string{c.Driver.Name + "/zone": zone}}}
+	}
 	pool, err := lv.StoragePoolLookupByName(poolName)
 	if err != nil {
 		response.Status.VolumeCondition = &csi.VolumeCondition{Abnormal: true, Message: fmt.Sprintf("Pool %s not found or with error (%s)", poolName, err.Error())}

diff --git a/internal/provider/csi/controller/volume.go b/internal/provider/csi/controller/volume.go
@@ -33,17 +33,19 @@ func (c *Controller) CreateVolume(ctx context.Context, request *csi.CreateVolume
 	if violations := validateCapabilities(request.VolumeCapabilities); len(violations) > 0 {
 		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("volume capabilities cannot be satisified: %s", strings.Join(violations, "; ")))
 	}
+	toppology := []*csi.Topology{}
 	zone := ""
-	if request.AccessibilityRequirements.Preferred != nil {
+	if request.AccessibilityRequirements != nil && request.AccessibilityRequirements.Preferred != nil {
 		for _, topology := range request.AccessibilityRequirements.Preferred {
 			if zoneSegment, ok := topology.Segments[c.Driver.Name+"/zone"]; ok && zoneSegment != "" {
 				zone = zoneSegment
+				toppology = request.AccessibilityRequirements.Preferred
 			}
 		}
 	}
 	poolName := request.Parameters["pool"]
 	bus := request.Parameters["bus"]
-	fstype := request.Parameters["fstype"]
+	fstype := request.Parameters["csi.storage.k8s.io/fstype"]
 	unlock := c.Driver.DiskLock(poolName, request.Name)
 	defer unlock()
 
@@ -92,6 +94,7 @@ func (c *Controller) CreateVolume(ctx context.Context, request *csi.CreateVolume
 				c.Driver.Name + "/fstype": fstype,
 				c.Driver.Name + "/zone":   zone,
 			},
+			AccessibleTopology: toppology,
 		},
 	}, nil
 }