Merge pull request #66 from slr71/main

Reverted the changes from a PR that wasn't supposed to be merged yet.
cyverse-de · Jun 3, 2024 · f135b5d · f135b5d
2 parents eb8c2cd + 8909f1d
commit f135b5d
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 435 deletions.
diff --git a/internal/constants.go b/internal/constants.go
@@ -7,19 +7,13 @@ const (
 	porklockConfigSecretName = "porklock-config"
 	porklockConfigMountPath  = "/etc/porklock"
 
-	csiDriverName                        = "irods.csi.cyverse.org"
-	csiDriverStorageClassName            = "irods-sc"
-	csiDriverInputVolumeNamePrefix       = "csi-input-volume"
-	csiDriverInputVolumeClaimNamePrefix  = "csi-input-volume-claim"
-	csiDriverOutputVolumeNamePrefix      = "csi-output-volume"
-	csiDriverOutputVolumeClaimNamePrefix = "csi-output-volume-claim"
-	csiDriverHomeVolumeNamePrefix        = "csi-home-volume"
-	csiDriverHomeVolumeClaimNamePrefix   = "csi-home-volume-claim"
-	csiDriverSharedVolumeNamePrefix      = "csi-shared-volume"
-	csiDriverSharedVolumeClaimNamePrefix = "csi-shared-volume-claim"
-	csiDriverDataVolumeNamePrefix        = "csi-data-volume"
-	csiDriverDataVolumeClaimNamePrefix   = "csi-data-volume-claim"
-	csiDriverLocalMountPath              = "/data-store"
+	csiDriverName                      = "irods.csi.cyverse.org"
+	csiDriverStorageClassName          = "irods-sc"
+	csiDriverDataVolumeNamePrefix      = "csi-data-volume"
+	csiDriverDataVolumeClaimNamePrefix = "csi-data-volume-claim"
+	csiDriverInputVolumeMountPath      = "/input"
+	csiDriverOutputVolumeMountPath     = "/output"
+	csiDriverLocalMountPath            = "/data-store"
 
 	// The file transfers volume serves as the working directory when IRODS CSI Driver integration is disabled.
 	fileTransfersVolumeName        = "input-files"