Fix issue where volumeMounts were being unnecessarily added

Improve check for whether the volumeMount subpaths workaround is
required for a particular deployment. Previously, we only checked
whether any volumes were defined, which failed on OpenShift due to a
secret volume being in the list. Now we check to make sure the common
PVC volume is present in the deployment before applying the workaround.

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

controllers/workspace/provision/deployment.go

@@ -223,7 +223,7 @@ func getSpecDeployment(
 		},
 	}
 
-	if len(podAdditions.Volumes) > 0 {
+	if needsPVCWorkaround(podAdditions) {
 		// Kubernetes creates directories in a PVC to support subpaths such that only the leaf directory has g+rwx permissions.
 		// This means that mounting the subpath e.g. <workspace-id>/plugins will result in the <workspace-id> directory being
 		// created with 755 permissions, requiring the root UID to remove it.
@@ -353,3 +353,13 @@ func getWorkspaceSubpathVolumeMount(workspaceId string) corev1.VolumeMount {
 
 	return workspaceVolumeMount
 }
+
+func needsPVCWorkaround(podAdditions *v1alpha1.PodAdditions) bool {
+	commonPVCName := config.ControllerCfg.GetWorkspacePVCName()
+	for _, vol := range podAdditions.Volumes {
+		if vol.Name == commonPVCName {
+			return true
+		}
+	}
+	return false
+}