seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove che.infra.kubernetes.pvc.storage_class_name property 

Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
pull/344/head
Andrew Obuchowicz 2022-07-27 15:26:38 -04:00 committed by Ilya Buziuk
parent 5286f28c51
commit debae71fc7
10 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
View File

@ -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

7
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java
View File

@ -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<String> 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;

3
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java
View File

@ -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;

7
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java
View File

@ -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;
}

4
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PerWorkspacePVCStrategy.java
View File

@ -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

3
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/AsyncStorageProvisioner.java
View File

@ -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;
}

6
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java
View File

@ -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(

4
infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java
View File

@ -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);

4
infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplier.java
View File

@ -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);

3
infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/devfile/OpenshiftComponentToWorkspaceApplierTest.java
View File

@ -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);