Remove Stack service (#14078)

* Remove Che6 Stack concept Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
eclipse-che · Sep 3, 2019 · 40ee503 · 40ee503
1 parent 3da8646
commit 40ee503
Show file tree

Hide file tree

Showing 93 changed files with 186 additions and 6,930 deletions.
diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
@@ -73,7 +73,6 @@
 import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceIdEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceNameEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.WorkspaceNamespaceNameEnvVarProvider;
-import org.eclipse.che.api.workspace.server.stack.StackLoader;
 import org.eclipse.che.api.workspace.server.token.MachineTokenProvider;
 import org.eclipse.che.api.workspace.server.wsplugins.ChePluginsApplier;
 import org.eclipse.che.commons.auth.token.ChainedTokenExtractor;
@@ -156,12 +155,6 @@ protected void configure() {
 
     install(new DevfileModule());
 
-    MapBinder<String, String> stacks =
-        MapBinder.newMapBinder(
-            binder(), String.class, String.class, Names.named(StackLoader.CHE_PREDEFINED_STACKS));
-    stacks.addBinding("stacks.json").toInstance("stacks-images");
-    stacks.addBinding("che-in-che.json").toInstance("");
-    bind(org.eclipse.che.api.workspace.server.stack.StackService.class);
     bind(org.eclipse.che.api.workspace.server.TemporaryWorkspaceRemover.class);
     bind(org.eclipse.che.api.workspace.server.WorkspaceService.class);
     install(new FactoryModuleBuilder().build(ServersCheckerFactory.class));
@@ -310,7 +303,6 @@ private void configureSingleUserMode(Map<String, String> persistenceProperties)
     bind(TokenValidator.class).to(org.eclipse.che.api.local.DummyTokenValidator.class);
     bind(MachineTokenProvider.class).to(MachineTokenProvider.EmptyMachineTokenProvider.class);
 
-    bind(org.eclipse.che.api.workspace.server.stack.StackLoader.class);
     bind(DataSource.class).toProvider(org.eclipse.che.core.db.h2.H2DataSourceProvider.class);
 
     install(new org.eclipse.che.api.user.server.jpa.UserJpaModule());

diff --git a/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml b/assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
@@ -32,7 +32,6 @@
         <class>org.eclipse.che.api.workspace.server.model.impl.SourceStorageImpl</class>
         <class>org.eclipse.che.api.workspace.server.model.impl.ServerConfigImpl</class>
         <class>org.eclipse.che.api.workspace.server.model.impl.VolumeImpl</class>
-        <class>org.eclipse.che.api.workspace.server.model.impl.stack.StackImpl</class>
 
         <class>org.eclipse.che.api.workspace.server.model.impl.CommandImpl</class>
 
@@ -68,8 +67,7 @@
         <class>org.eclipse.che.multiuser.api.permission.server.model.impl.SystemPermissionsImpl</class>
         <class>org.eclipse.che.multiuser.api.permission.server.model.impl.AbstractPermissions</class>
         <class>org.eclipse.che.multiuser.permission.workspace.server.model.impl.WorkerImpl</class>
-        <class>org.eclipse.che.multiuser.permission.workspace.server.stack.StackPermissionsImpl</class>
-
+
         <class>org.eclipse.che.multiuser.resource.spi.impl.FreeResourcesLimitImpl</class>
         <class>org.eclipse.che.multiuser.resource.spi.impl.ResourceImpl</class>
 

diff --git a/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json b/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json
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
@@ -352,15 +352,6 @@ db.schema.flyway.scripts.suffix=.sql
 db.schema.flyway.scripts.version_separator=__
 db.schema.flyway.scripts.locations=classpath:che-schema
 
-# Defines whether stacks loaded once or each time server starts.
-# If value is 'false' stacks will be loaded once after database is initialized,
-# otherwise stacks will be loaded each time server starts.
-# Stacks loading overrides existing predefined stacks with new data
-# defined in stacks.json.
-#     - 'default'   : false
-# Note that this property is needed for backward compatibility and will be removed soon.
-che.predefined.stacks.reload_on_start=false
-
 ### Kubernetes Infra parameters
 
 # Configuration of Kubernetes client that Infra will use

diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml
@@ -64,7 +64,6 @@ data:
   CHE_MULTIUSER: {{ .Values.global.multiuser | quote }}
   CHE_OAUTH_GITHUB_CLIENTID: {{ .Values.global.gitHubClientID | quote}}
   CHE_OAUTH_GITHUB_CLIENTSECRET: {{ .Values.global.gitHubClientSecret | quote}}
-  CHE_PREDEFINED_STACKS_RELOAD__ON__START: "false"
   JAVA_OPTS: "-XX:MaxRAMFraction=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dsun.zip.disableMemoryMapping=true -Xms20m "
   CHE_WORKSPACE_AUTO_START: "false"
 {{- if .Values.global.tls.enabled }}

diff --git a/deploy/openshift/templates/che-server-template.yaml b/deploy/openshift/templates/che-server-template.yaml
@@ -138,8 +138,6 @@ objects:
             value: "${CHE_OAUTH_GITHUB_CLIENTID}"
           - name: CHE_OAUTH_GITHUB_CLIENTSECRET
             value: "${CHE_OAUTH_GITHUB_CLIENTSECRET}"
-          - name: CHE_PREDEFINED_STACKS_RELOAD__ON__START
-            value: 'true'
           - name: JAVA_OPTS
             value: "-XX:MaxRAMFraction=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10
               -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90