cleanup

Signed-off-by: Niclas Schad <niclas.schad@stackit.cloud>

Author: nschad

pkg/csi/blockstorage/nodeserver.go

@@ -302,12 +302,6 @@ func (ns *nodeServer) NodeGetInfo(ctx context.Context, _ *csi.NodeGetInfoRequest
 		return nil, status.Errorf(codes.Internal, "[NodeGetInfo] unable to retrieve instance id of node %v", err)
 	}
 
-	//flavor, err := ns.Metadata.GetFlavor(ctx)
-	//if err != nil {
-	//	return nil, status.Errorf(codes.Internal, "[NodeGetInfo] unable to retrieve flavor of node %v", err)
-	//}
-
-	// Subtract already mounted Volumes
 	emptyPCIeRootPorts, err := mount.CountFreePCIeSlots()
 	if err != nil {
 		klog.Errorf("[NodeGetInfo] unable to retrieve PCIe root ports %v", err)
@@ -319,6 +313,7 @@ func (ns *nodeServer) NodeGetInfo(ctx context.Context, _ *csi.NodeGetInfoRequest
 		klog.Errorf("[NodeGetInfo] unable to retrieve volume count %v", err)
 	}
 
+	// maxVolumesPerNode is the result of all free/empty PCIClassBridgePCI ports plus all already mounted volumes.
 	maxVolumesPerNode := emptyPCIeRootPorts + vols
 
 	nodeInfo := &csi.NodeGetInfoResponse{

pkg/csi/blockstorage/utils.go

@@ -84,23 +84,6 @@ func ParseEndpoint(ep string) (proto, addr string, err error) {
 	return "", "", fmt.Errorf("invalid endpoint: %v", ep)
 }
 
-func DetermineMaxVolumesByFlavor(flavor string) int64 {
-	flavorParts := strings.Split(flavor, ".")
-
-	// The following numbers were specified by the IaaS team. They are based on actual tests.
-	switch {
-	case strings.HasPrefix(flavor, "n"):
-		// Flavors starting with 'n' are nvidia GPU flavors
-		return 13
-	case strings.HasSuffix(flavorParts[0], "2a"):
-		// AMD 2nd Gen
-		return 159
-	default:
-		// All other flavors can mount 28 volumes
-		return 28
-	}
-}
-
 func logGRPC(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
 	callID := serverGRPCEndpointCallCounter.Add(1)
 

pkg/csi/blockstorage/utils_test.go

@@ -19,8 +19,8 @@ var (
 )
 
 const (
-	RedhatVendor      = "0x1af4"
-	VirtioBlockDevice = "0x1042"
+	// PCIClassBridgePCI Linux constant: https://github.com/torvalds/linux/blob/e43ffb69e0438cddd72aaa30898b4dc446f664f8/include/linux/pci_ids.h#L62
+	PCIClassBridgePCI = "0x0604"
 )
 
 func newDeviceStats(statfs *unix.Statfs_t) *DeviceStats {
@@ -63,7 +63,7 @@ func CountFreePCIeSlots() (int64, error) {
 		class := strings.TrimSpace(string(classBuf))
 
 		// Class 0x060400 is a PCI-to-PCI bridge (standard for Root Ports)
-		if strings.HasPrefix(class, "0x0604") {
+		if strings.HasPrefix(class, PCIClassBridgePCI) {
 			// 2. Check if the port has downstream devices
 			// If the bridge has children, they appear as subdirectories
 			// matching the PCI address format (e.g., 0000:01:00.0)
@@ -114,20 +114,3 @@ func CountLocalCSIVolumes(driverName string) (int64, error) {
 
 	return int64(volumeCount), nil
 }
-
-func IsNonBlockDevice(devPath string, file os.DirEntry) bool {
-	var isNonBlockDevice bool
-	pciDevicePath := filepath.Join(devPath, file.Name())
-	vendorBuf, err := os.ReadFile(filepath.Join(pciDevicePath, "vendor"))
-	if err != nil {
-		klog.Errorf("failed to read PCI device vendor %s : %v", pciDevicePath, err)
-	}
-	deviceBuf, err := os.ReadFile(filepath.Join(pciDevicePath, "device"))
-	if err != nil {
-		klog.Errorf("failed to read PCI device file %s : %v", pciDevicePath, err)
-	}
-	if strings.TrimSpace(string(vendorBuf)) == RedhatVendor && strings.TrimSpace(string(deviceBuf)) != VirtioBlockDevice {
-		isNonBlockDevice = true
-	}
-	return isNonBlockDevice
-}