Updating topology logic to use the latest version of CSINodeInfo

Author: verult

pkg/controller/topology.go

@@ -298,8 +298,8 @@ func sortAndShift(terms []topologyTerm, primary topologyTerm, shiftIndex uint32)
 }
 
 func getTopologyKeys(nodeInfo *csiv1alpha1.CSINodeInfo, driverName string) []string {
-	for _, driver := range nodeInfo.CSIDrivers {
-		if driver.Driver == driverName {
+	for _, driver := range nodeInfo.Spec.Drivers {
+		if driver.Name == driverName {
 			return driver.TopologyKeys
 		}
 	}

pkg/controller/topology_test.go

@@ -1187,21 +1187,23 @@ func buildNodeInfos(nodeInfos []map[string][]string) *csiv1alpha1.CSINodeInfoLis
 				Name: nodeName,
 			},
 		}
+		var csiDrivers []csiv1alpha1.CSIDriverInfoSpec
 		for driver, topologyKeys := range nodeInfo {
-			driverInfos := []csiv1alpha1.CSIDriverInfo{
+			driverInfos := []csiv1alpha1.CSIDriverInfoSpec{
 				{
-					Driver:       driver,
+					Name:         driver,
 					NodeID:       nodeName,
 					TopologyKeys: topologyKeys,
 				},
 				{
-					Driver:       "net.example.storage/other-driver",
+					Name:         "net.example.storage/other-driver",
 					NodeID:       nodeName,
 					TopologyKeys: []string{"net.example.storage/rack"},
 				},
 			}
-			n.CSIDrivers = append(n.CSIDrivers, driverInfos...)
+			csiDrivers = append(csiDrivers, driverInfos...)
 		}
+		n.Spec = csiv1alpha1.CSINodeInfoSpec{Drivers: csiDrivers}
 		list.Items = append(list.Items, n)
 		i++
 	}