manila-csi-plugin: Enable auto-detection of topology, node ID

Same as we do for Cinder. A separate change will deprecate the
respective options.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

cmd/cinder-csi-plugin/main.go

@@ -129,7 +129,7 @@ func handle() {
 	}
 
 	if provideNodeService {
-		//Initialize mount
+		// Initialize mount
 		mount := mount.GetMountProvider()
 
 		cfg, err := openstack.GetConfigFromFiles(cloudConfig)
@@ -138,7 +138,7 @@ func handle() {
 			return
 		}
 
-		//Initialize Metadata
+		// Initialize Metadata
 		metadata := metadata.GetMetadataProvider(cfg.Metadata.SearchOrder)
 
 		d.SetupNodeService(mount, metadata, cfg.BlockStorage, additionalTopologies)

cmd/manila-csi-plugin/main.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/csiclient"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/manilaclient"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/runtimeconfig"
+	"k8s.io/cloud-provider-openstack/pkg/util/metadata"
 	"k8s.io/cloud-provider-openstack/pkg/version"
 	"k8s.io/component-base/cli"
 	"k8s.io/klog/v2"
@@ -108,7 +109,10 @@ func main() {
 			}
 
 			if provideNodeService {
-				err = d.SetupNodeService()
+				// Initialize metadata
+				metadata := metadata.GetMetadataProvider("")
+
+				err = d.SetupNodeService(metadata)
 				if err != nil {
 					klog.Fatalf("Driver node service initialization failed: %v", err)
 				}

pkg/csi/manila/driver.go

@@ -32,6 +32,7 @@ import (
 	"k8s.io/client-go/listers/core/v1"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/csiclient"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/manilaclient"
+	"k8s.io/cloud-provider-openstack/pkg/util/metadata"
 	"k8s.io/cloud-provider-openstack/pkg/version"
 	"k8s.io/klog/v2"
 )
@@ -182,11 +183,7 @@ func (d *Driver) SetupControllerService() error {
 	return nil
 }
 
-func (d *Driver) SetupNodeService() error {
-	if err := argNotEmpty(d.nodeID, "node ID"); err != nil {
-		return err
-	}
-
+func (d *Driver) SetupNodeService(metadata metadata.IMetadata) error {
 	klog.Info("Providing node service")
 
 	var supportsNodeStage bool
@@ -206,7 +203,12 @@ func (d *Driver) SetupNodeService() error {
 
 	d.addNodeServiceCapabilities(nscaps)
 
-	d.ns = &nodeServer{d: d, supportsNodeStage: supportsNodeStage, nodeStageCache: make(map[volumeID]stageCacheEntry)}
+	d.ns = &nodeServer{
+		d:                 d,
+		metadata:          metadata,
+		supportsNodeStage: supportsNodeStage,
+		nodeStageCache:    make(map[volumeID]stageCacheEntry),
+	}
 	return nil
 }
 

pkg/csi/manila/nodeserver.go

@@ -29,12 +29,14 @@ import (
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/options"
 	"k8s.io/cloud-provider-openstack/pkg/csi/manila/shareadapters"
 	clouderrors "k8s.io/cloud-provider-openstack/pkg/util/errors"
+	"k8s.io/cloud-provider-openstack/pkg/util/metadata"
 	"k8s.io/klog/v2"
 )
 
 type nodeServer struct {
 	d *Driver
 
+	metadata          metadata.IMetadata
 	supportsNodeStage bool
 	// The result of NodeStageVolume is stashed away for NodePublishVolume(s) that will follow
 	nodeStageCache    map[volumeID]stageCacheEntry
@@ -324,13 +326,23 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 }
 
 func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+	nodeID, err := ns.metadata.GetInstanceID()
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "[NodeGetInfo] unable to retrieve instance id of node %v", err)
+	}
+
 	nodeInfo := &csi.NodeGetInfoResponse{
-		NodeId: ns.d.nodeID,
+		NodeId: nodeID,
 	}
 
 	if ns.d.withTopology {
+		zone, err := ns.metadata.GetAvailabilityZone()
+		if err != nil {
+			return nil, status.Errorf(codes.Internal, "[NodeGetInfo] Unable to retrieve availability zone of node %v", err)
+		}
+
 		nodeInfo.AccessibleTopology = &csi.Topology{
-			Segments: map[string]string{topologyKey: ns.d.nodeAZ},
+			Segments: map[string]string{topologyKey: zone},
 		}
 	}
 

tests/sanity/cinder/sanity_test.go

@@ -27,14 +27,14 @@ func TestDriver(t *testing.T) {
 	}
 
 	fakemnt := GetFakeMountProvider()
-	fakemet := &fakemetadata{}
+	fakemeta := &fakemetadata{}
 	fakeOpts := openstack.BlockStorageOpts{
 		RescanOnResize:        false,
 		NodeVolumeAttachLimit: 200,
 	}
 
 	d.SetupControllerService(openstack.OsInstances)
-	d.SetupNodeService(fakemnt, fakemet, fakeOpts, map[string]string{})
+	d.SetupNodeService(fakemnt, fakemeta, fakeOpts, map[string]string{})
 
 	// TODO: Stop call
 

tests/sanity/manila/fakemetadata.go

@@ -0,0 +1,16 @@
+package sanity
+
+var FakeInstanceID = "321a8b81-3660-43e5-bab8-6470b65ee4e8"
+var FakeAvailability = "fake-az"
+
+type fakemetadata struct{}
+
+// fake metadata
+
+func (m *fakemetadata) GetInstanceID() (string, error) {
+	return FakeInstanceID, nil
+}
+
+func (m *fakemetadata) GetAvailabilityZone() (string, error) {
+	return FakeAvailability, nil
+}

tests/sanity/manila/sanity_test.go

@@ -54,7 +54,9 @@ func TestDriver(t *testing.T) {
 		t.Fatalf("Failed to initialize CSI Manila controller service: %v", err)
 	}
 
-	err = d.SetupNodeService()
+	fakemeta := &fakemetadata{}
+
+	err = d.SetupNodeService(fakemeta)
 	if err != nil {
 		t.Fatalf("Failed to initialize CSI Manila node service: %v", err)
 	}