From debae71fc712a21b7cacb4335ec07fdadbe28295 Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Wed, 27 Jul 2022 15:26:38 -0400 Subject: [PATCH] remove che.infra.kubernetes.pvc.storage_class_name property Signed-off-by: Andrew Obuchowicz --- .../src/main/webapp/WEB-INF/classes/che/che.properties | 6 ------ .../devfile/KubernetesComponentToWorkspaceApplier.java | 7 ++----- .../kubernetes/namespace/pvc/CommonPVCStrategy.java | 3 +-- .../kubernetes/namespace/pvc/PVCProvisioner.java | 7 ++----- .../kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java | 4 +--- .../kubernetes/provision/AsyncStorageProvisioner.java | 3 +-- .../kubernetes/wsplugins/ChePluginsVolumeApplier.java | 6 ++---- .../devfile/KubernetesComponentToWorkspaceApplierTest.java | 4 ---- .../devfile/OpenshiftComponentToWorkspaceApplier.java | 4 +--- .../devfile/OpenshiftComponentToWorkspaceApplierTest.java | 3 --- 10 files changed, 10 insertions(+), 37 deletions(-) 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 f72cae9086..c2f2dca63f 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 @@ -417,12 +417,6 @@ che.infra.kubernetes.pvc.precreate_subpaths=true -# Defines the storage class of Persistent Volume Claim for the workspaces. -# Empty strings means "use default". -che.infra.kubernetes.pvc.storage_class_name= - - - # Pod that is launched when performing persistent volume claim maintenance jobs on OpenShift che.infra.kubernetes.pvc.jobs.image=registry.access.redhat.com/ubi8-minimal:8.3-230 diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java index 5708d08b0a..2710fa17b1 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2021 Red Hat, Inc. + * Copyright (c) 2012-2022 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -88,7 +88,6 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa EnvVars envVars, @Named("che.workspace.projects.storage") String projectFolderPath, @Named("che.workspace.projects.storage.default.size") String defaultProjectPVCSize, - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, @Named("che.workspace.sidecar.image_pull_policy") String imagePullPolicy, @Named("che.infra.kubernetes.singlehost.workspace.devfile_endpoint_exposure") String devfileEndpointsExposure, @@ -100,7 +99,6 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa KubernetesEnvironment.TYPE, projectFolderPath, defaultProjectPVCSize, - pvcStorageClassName, imagePullPolicy, devfileEndpointsExposure, kubernetesBasedComponentTypes); @@ -113,7 +111,6 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa String environmentType, String projectFolderPath, String defaultProjectPVCSize, - String pvcStorageClassName, String imagePullPolicy, String devfileEndpointsExposure, Set kubernetesBasedComponentTypes) { @@ -123,7 +120,7 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa this.projectFolderPath = projectFolderPath; this.defaultProjectPVCSize = defaultProjectPVCSize; this.defaultPVCAccessMode = "TEST"; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; this.imagePullPolicy = imagePullPolicy; this.kubernetesBasedComponentTypes = kubernetesBasedComponentTypes; this.envVars = envVars; 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 390746da0b..e060b74469 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 @@ -106,7 +106,6 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy { @Inject public CommonPVCStrategy( @Named("che.infra.kubernetes.pvc.precreate_subpaths") boolean preCreateDirs, - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, @Named("che.infra.kubernetes.pvc.wait_bound") boolean waitBound, PVCSubPathHelper pvcSubPathHelper, KubernetesNamespaceFactory factory, @@ -119,7 +118,7 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy { this.pvcQuantity = "test"; this.pvcAccessMode = "TEST"; this.preCreateDirs = preCreateDirs; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; this.waitBound = waitBound; this.pvcSubPathHelper = pvcSubPathHelper; this.factory = factory; diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java index 8336026362..d4c3aef355 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Optional; import javax.inject.Inject; -import javax.inject.Named; import org.eclipse.che.api.core.model.workspace.config.MachineConfig; import org.eclipse.che.api.core.model.workspace.config.Volume; import org.eclipse.che.api.workspace.server.spi.environment.InternalMachineConfig; @@ -54,13 +53,11 @@ public class PVCProvisioner { private final PodsVolumes podsVolumes; @Inject - public PVCProvisioner( - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, - PodsVolumes podsVolumes) { + public PVCProvisioner(PodsVolumes podsVolumes) { this.pvcNamePrefix = "TEST"; this.pvcQuantity = "test"; this.pvcAccessMode = "TEST"; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; this.podsVolumes = podsVolumes; } 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 e23dac5f2e..e71b58e96f 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 @@ -53,7 +53,6 @@ public class PerWorkspacePVCStrategy extends CommonPVCStrategy { @Inject public PerWorkspacePVCStrategy( @Named("che.infra.kubernetes.pvc.precreate_subpaths") boolean preCreateDirs, - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, @Named("che.infra.kubernetes.pvc.wait_bound") boolean waitBound, PVCSubPathHelper pvcSubPathHelper, KubernetesNamespaceFactory factory, @@ -64,7 +63,6 @@ public class PerWorkspacePVCStrategy extends CommonPVCStrategy { WorkspaceManager workspaceManager) { super( preCreateDirs, - pvcStorageClassName, waitBound, pvcSubPathHelper, factory, @@ -77,7 +75,7 @@ public class PerWorkspacePVCStrategy extends CommonPVCStrategy { this.factory = factory; this.pvcAccessMode = "TEST"; this.pvcQuantity = "test"; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; } @Override diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/AsyncStorageProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/AsyncStorageProvisioner.java index 94b0687a69..9b5d43b090 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/AsyncStorageProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/AsyncStorageProvisioner.java @@ -129,7 +129,6 @@ public class AsyncStorageProvisioner { @Named("che.workspace.sidecar.image_pull_policy") String sidecarImagePullPolicy, @Named("che.infra.kubernetes.async.storage.image") String asyncStorageImage, @Named("che.infra.kubernetes.pvc.strategy") String pvcStrategy, - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, SshManager sshManager, KubernetesClientFactory kubernetesClientFactory) { this.sidecarImagePullPolicy = sidecarImagePullPolicy; @@ -138,7 +137,7 @@ public class AsyncStorageProvisioner { this.pvcAccessMode = "TEST"; this.pvcStrategy = pvcStrategy; this.pvcName = "TEST"; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; this.sshManager = sshManager; this.kubernetesClientFactory = kubernetesClientFactory; } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java index 1834e3d2dc..e056605c9b 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java @@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.VolumeBuilder; import java.util.Collection; import java.util.Optional; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Singleton; import org.eclipse.che.api.workspace.server.wsplugins.model.Volume; import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment; @@ -39,11 +38,10 @@ public class ChePluginsVolumeApplier { private final String pvcStorageClassName; @Inject - public ChePluginsVolumeApplier( - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName) { + public ChePluginsVolumeApplier() { this.pvcQuantity = "test"; this.pvcAccessMode = "TEST"; - this.pvcStorageClassName = pvcStorageClassName; + this.pvcStorageClassName = "TEST"; } public void applyVolumes( diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java index 8010c08b06..0108083db7 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java @@ -115,7 +115,6 @@ public class KubernetesComponentToWorkspaceApplierTest { envVars, PROJECT_MOUNT_PATH, "1Gi", - "", "Always", MULTI_HOST_STRATEGY, k8sBasedComponents); @@ -558,7 +557,6 @@ public class KubernetesComponentToWorkspaceApplierTest { envVars, PROJECT_MOUNT_PATH, "1Gi", - "", "Never", MULTI_HOST_STRATEGY, k8sBasedComponents); @@ -707,7 +705,6 @@ public class KubernetesComponentToWorkspaceApplierTest { envVars, PROJECT_MOUNT_PATH, "1Gi", - "", "Always", SINGLE_HOST_STRATEGY, k8sBasedComponents); @@ -759,7 +756,6 @@ public class KubernetesComponentToWorkspaceApplierTest { envVars, PROJECT_MOUNT_PATH, "1Gi", - "", "Always", MULTI_HOST_STRATEGY, k8sBasedComponents); diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplier.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplier.java index d0cd065085..1995437846 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplier.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2021 Red Hat, Inc. + * Copyright (c) 2012-2022 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -30,7 +30,6 @@ public class OpenshiftComponentToWorkspaceApplier extends KubernetesComponentToW EnvVars envVars, @Named("che.workspace.projects.storage") String projectFolderPath, @Named("che.workspace.projects.storage.default.size") String defaultProjectPVCSize, - @Named("che.infra.kubernetes.pvc.storage_class_name") String pvcStorageClassName, @Named("che.workspace.sidecar.image_pull_policy") String imagePullPolicy, @Named("che.infra.kubernetes.singlehost.workspace.devfile_endpoint_exposure") String devfileEndpointsExposure, @@ -42,7 +41,6 @@ public class OpenshiftComponentToWorkspaceApplier extends KubernetesComponentToW OpenShiftEnvironment.TYPE, projectFolderPath, defaultProjectPVCSize, - pvcStorageClassName, imagePullPolicy, devfileEndpointsExposure, kubernetesBasedComponentTypes); diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplierTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplierTest.java index de93d057a9..a5c907dce5 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplierTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplierTest.java @@ -79,7 +79,6 @@ public class OpenshiftComponentToWorkspaceApplierTest { envVars, "/projects", "1Gi", - "", "Always", MULTI_HOST_STRATEGY, k8sBasedComponents); @@ -118,7 +117,6 @@ public class OpenshiftComponentToWorkspaceApplierTest { envVars, "/projects", "1Gi", - "", "Always", SINGLE_HOST_STRATEGY, openshiftBasedComponents); @@ -172,7 +170,6 @@ public class OpenshiftComponentToWorkspaceApplierTest { envVars, "/projects", "1Gi", - "", "Always", MULTI_HOST_STRATEGY, openshiftBasedComponents);