use v1 and v1beta clients depending on which named pipes are available

Author: mauriciopoppe

Diff for: pkg/gce-pd-csi-driver/utils_windows.go

@@ -28,29 +28,47 @@ func formatAndMount(source, target, fstype string, options []string, m *mount.Sa
 	if !strings.EqualFold(fstype, defaultWindowsFsType) {
 		return fmt.Errorf("GCE PD CSI driver can only supports %s file system, it does not support %s", defaultWindowsFsType, fstype)
 	}
-	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return fmt.Errorf("could not cast to csi proxy class")
+	switch m.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1)
+		return proxy.FormatAndMount(source, target, fstype, options)
+
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1Beta)
+		return proxy.FormatAndMount(source, target, fstype, options)
 	}
-	return proxy.FormatAndMount(source, target, fstype, options)
+
+	return fmt.Errorf("Invalid interface type=%v", m.Interface)
 }
 
 // Before mounting (which means creating symlink) in Windows, the targetPath should
 // not exist. Currently kubelet creates the path beforehand, this is a workaround to
 // remove the path first.
 func preparePublishPath(path string, m *mount.SafeFormatAndMount) error {
-	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return fmt.Errorf("could not cast to csi proxy class")
-	}
-	exists, err := proxy.ExistsPath(path)
-	if err != nil {
-		return err
+	switch m.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1)
+		exists, err := proxy.ExistsPath(path)
+		if err != nil {
+			return err
+		}
+		if exists {
+			return proxy.RemovePodDir(path)
+		}
+		return nil
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1Beta)
+		exists, err := proxy.ExistsPath(path)
+		if err != nil {
+			return err
+		}
+		if exists {
+			return proxy.RemovePodDir(path)
+		}
+		return nil
 	}
-	if exists {
-		return proxy.RemovePodDir(path)
-	}
-	return nil
+
+	return fmt.Errorf("Invalid interface type=%v", m.Interface)
 }
 
 // Before staging (which means creating symlink) in Windows, the targetPath should
@@ -60,19 +78,27 @@ func prepareStagePath(path string, m *mount.SafeFormatAndMount) error {
 }
 
 func cleanupPublishPath(path string, m *mount.SafeFormatAndMount) error {
-	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return fmt.Errorf("could not cast to csi proxy class")
+	switch m.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1)
+		return proxy.RemovePodDir(path)
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1Beta)
+		return proxy.RemovePodDir(path)
 	}
-	return proxy.RemovePodDir(path)
+	return fmt.Errorf("Invalid interface type=%v", m.Interface)
 }
 
 func cleanupStagePath(path string, m *mount.SafeFormatAndMount) error {
-	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return fmt.Errorf("could not cast to csi proxy class")
+	switch m.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1)
+		return proxy.UnmountDevice(path)
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1Beta)
+		return proxy.UnmountDevice(path)
 	}
-	return proxy.UnmountDevice(path)
+	return fmt.Errorf("Invalid interface type=%v", m.Interface)
 }
 
 // search Windows disk number by volumeID
@@ -85,18 +111,29 @@ func getDevicePath(ns *GCENodeServer, volumeID, partition string) (string, error
 	if err != nil {
 		return "", fmt.Errorf("error getting device name: %v", err)
 	}
-	proxy, ok := ns.Mounter.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return "", fmt.Errorf("could not cast to csi proxy class")
+
+	switch ns.Mounter.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := ns.Mounter.Interface.(*mounter.CSIProxyMounterV1)
+		return proxy.GetDevicePath(deviceName, partition, volumeKey.Name)
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := ns.Mounter.Interface.(*mounter.CSIProxyMounterV1Beta)
+		return proxy.GetDevicePath(deviceName, partition, volumeKey.Name)
 	}
-	return proxy.GetDevicePath(deviceName, partition, volumeKey.Name)
+
+	return "", fmt.Errorf("Invalid interface type=%v", ns.Mounter.Interface)
+
 }
 
 func getBlockSizeBytes(devicePath string, m *mount.SafeFormatAndMount) (int64, error) {
-	proxy, ok := m.Interface.(*mounter.CSIProxyMounter)
-	if !ok {
-		return 0, fmt.Errorf("could not cast to csi proxy class")
+	switch m.Interface.(type) {
+	case *mounter.CSIProxyMounterV1:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1)
+		return proxy.GetBlockSizeBytes(devicePath)
+	case *mounter.CSIProxyMounterV1Beta:
+		proxy := m.Interface.(*mounter.CSIProxyMounterV1Beta)
+		return proxy.GetBlockSizeBytes(devicePath)
 	}
+	return 0, fmt.Errorf("Invalid interface type=%v", m.Interface)
 
-	return proxy.GetBlockSizeBytes(devicePath)
 }