diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index c2f2dca63f..1f289d5e73 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -407,14 +407,6 @@ che.infra.kubernetes.pvc.enabled=true # Existing PVC will be used or a new one will be created if it doesn't exist. che.infra.kubernetes.pvc.strategy=common -# Defines whether to run a job that creates workspace's subpath directories in persistent volume for the `common` strategy before launching a workspace. -# Necessary in some versions of {orch-name} as workspace subpath volume mounts are created with root permissions, -# and therefore cannot be modified by workspaces running as a user (presents an error importing projects into a workspace in {prod-short}). -# The default is `true`, but should be set to `false` if the version of {orch-name} creates subdirectories with user permissions. -# See: link:https://github.com/kubernetes/kubernetes/issues/41638[subPath in volumeMount is not writable for non-root users #41638] -# the {prod-short} Operator that this property has effect only if the `common` PVC strategy used. -che.infra.kubernetes.pvc.precreate_subpaths=true - # Pod that is launched when performing persistent volume claim maintenance jobs on OpenShift diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che_aliases.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che_aliases.properties index a2e5f18012..c2d70a0af7 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che_aliases.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che_aliases.properties @@ -19,7 +19,6 @@ che.infra.kubernetes.bootstrapper.installer_timeout_sec=che.infra.openshift.boot che.infra.kubernetes.bootstrapper.server_check_period_sec=che.infra.openshift.bootstrapper.server_check_period_sec che.infra.kubernetes.pvc.enabled=che.infra.openshift.pvc.enabled che.infra.kubernetes.pvc.strategy=che.infra.openshift.pvc.strategy -che.infra.kubernetes.pvc.precreate_subpaths=che.infra.openshift.pvc.precreate_subpaths che.infra.kubernetes.pvc.jobs.image=che.infra.openshift.pvc.jobs.image che.infra.kubernetes.pvc.jobs.memorylimit=che.infra.openshift.pvc.jobs.memorylimit che.infra.kubernetes.tls_enabled=che.infra.openshift.tls_enabled diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java index e060b74469..42e6550ff0 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java @@ -105,7 +105,6 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy { @Inject public CommonPVCStrategy( - @Named("che.infra.kubernetes.pvc.precreate_subpaths") boolean preCreateDirs, @Named("che.infra.kubernetes.pvc.wait_bound") boolean waitBound, PVCSubPathHelper pvcSubPathHelper, KubernetesNamespaceFactory factory, @@ -117,7 +116,7 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy { this.configuredPVCName = "test"; this.pvcQuantity = "test"; this.pvcAccessMode = "TEST"; - this.preCreateDirs = preCreateDirs; + this.preCreateDirs = true; this.pvcStorageClassName = "TEST"; this.waitBound = waitBound; this.pvcSubPathHelper = pvcSubPathHelper; diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java index e71b58e96f..426fcb1058 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java @@ -52,7 +52,6 @@ public class PerWorkspacePVCStrategy extends CommonPVCStrategy { @Inject public PerWorkspacePVCStrategy( - @Named("che.infra.kubernetes.pvc.precreate_subpaths") boolean preCreateDirs, @Named("che.infra.kubernetes.pvc.wait_bound") boolean waitBound, PVCSubPathHelper pvcSubPathHelper, KubernetesNamespaceFactory factory, @@ -62,7 +61,6 @@ public class PerWorkspacePVCStrategy extends CommonPVCStrategy { SubPathPrefixes subpathPrefixes, WorkspaceManager workspaceManager) { super( - preCreateDirs, waitBound, pvcSubPathHelper, factory,