Openshift connector improvements

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties

@@ -205,9 +205,14 @@ che.docker.ip.external=NULL
 #   - 'docker-local': internal address is address of container within docker network, and exposed ports
 #                     are used.
 #   - 'custom': The evaluation strategy may be customized through a template property.
+#   - 'docker-local-custom':  internal address is set as in docker-local strategy, external address is composed
+#                     as in the custom strategy with the 'template' and the 'external.protocol' properties.
+
 # The 'docker-local' strategy may be useful if a firewall prevents communication between che-server and
 # workspace containers, but will prevent communication when che-server and workspace containers are not
 # on the same Docker network.
+# The 'docker-local-custom' strategy may be useful when Che and the workspace servers need to be exposed on the
+# same single TCP port.
 che.docker.server_evaluation_strategy=default
 
 
@@ -298,12 +303,52 @@ che.openshift.project=eclipse-che
 che.openshift.serviceaccountname=cheserviceaccount
 che.openshift.liveness.probe.delay=300
 che.openshift.liveness.probe.timeout=1
+che.openshift.workspaces.pvc.name=claim-che-workspace
+che.openshift.workspaces.pvc.quantity=10Gi
+# Create secure route against HTTPS 
+# NOTE: In order to create routes against HTTPS 
+# Property 'strategy.che.docker.server_evaluation_strategy.secure.external.urls' should be also set to true
+che.openshift.secure.routes=false
+# Pod that is launched when performing persistent volume claim maintenance jobs on OpenShift
+che.openshift.jobs.image=centos:centos7
+che.openshift.jobs.memorylimit=250Mi
+
+# Run job to create workspace subpath directories in persistent volume before launching workspace.
+# Necessary in some versions of OpenShift/Kubernetes as workspace subpath volumemounts are created
+# with root permissions, and thus cannot be modified by workspaces running as user (presents as error
+# importing projects into workspace in Che). Default is "true", but should be set to false if version
+# of Openshift/Kubernetes creates subdirectories with user permissions.
+# Relevant issue: https://github.com/kubernetes/kubernetes/issues/41638
+che.openshift.precreate.workspace.dirs=true
+
+# Specifications of compute resources that can be consumed
+# by the workspace container:
+#
+# - Amount of memory required for a workspace container to run e.g. 512Mi
+che.openshift.workspace.memory.request=NULL
+#
+# - Maximum amount of memory a workspace container can use e.g. 1.3Gi
+che.openshift.workspace.memory.override=NULL
+
+# The Openshift will idle the server if no workspace is run for
+# this length of time.
+che.openshift.server.inactive.stop.timeout.ms=1800000
+
+#
+#
+# Be aware that setting che.openshift.workspace.memory.override
+# will override Che memory limits
+#
+# More information about setting Compute Resources in OpenShift can be
+# found here: https://docs.openshift.org/latest/dev_guide/compute_resources.html#dev-compute-resources
 
 # Which implementation of DockerConnector to use in managing containers. In general,
 # the base implementation of DockerConnector is appropriate, but OpenShiftConnector
 # is necessary for deploying Che on OpenShift. Options:
 #     - 'default'   : Use DockerConnector
 #     - 'openshift' : use OpenShiftConnector
+# Note that if 'openshift' connector is used, the property che.docker.ip.external
+# MUST be set.
 che.docker.connector=default
 
 # Defines whether stacks loaded once or each time server starts.

core/che-core-api-core/pom.xml

@@ -255,6 +255,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <!-- Exclude files until #3281 is resolved -->
+                        <exclude>**/ServerIdleEvent.java</exclude>
+                        <!-- End excluded files -->
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/event/ServerIdleEvent.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.api.core.event;
+/**
+ * Event informing about idling the che server.
+ */
+public class ServerIdleEvent {
+    private long timeout;
+
+    /**
+     * Implements the handler to handle idling.
+     */
+    public ServerIdleEvent(long timeout) {
+        super();
+        this.timeout = timeout;
+    }
+
+
+    public long getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(long timeout) {
+        this.timeout = timeout;
+    }
+}

dockerfiles/che/Dockerfile.centos

@@ -48,3 +48,6 @@ EXPOSE 8000 8080
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 ADD eclipse-che.tar.gz /home/user/
+RUN mkdir /logs && chmod 0777 /logs
+RUN chmod -R 0777 /home/user/
+RUN mkdir /data && chmod 0777 /data

dockerfiles/che/entrypoint.sh

@@ -51,7 +51,7 @@ Variables:
   export CHE_REGISTRY_HOST=${CHE_REGISTRY_HOST:-${DEFAULT_CHE_REGISTRY_HOST}}
 
   DEFAULT_CHE_PORT=8080
-  CHE_PORT=${CHE_PORT:-${DEFAULT_CHE_PORT}}
+  export CHE_PORT=${CHE_PORT:-${DEFAULT_CHE_PORT}}
 
   DEFAULT_CHE_IP=
   CHE_IP=${CHE_IP:-${DEFAULT_CHE_IP}}
@@ -244,18 +244,40 @@ init() {
   fi
   ### Are we going to use the embedded che.properties or one provided by user?`
   ### CHE_LOCAL_CONF_DIR is internal Che variable that sets where to load
-  export CHE_LOCAL_CONF_DIR="/conf"
-  if [ -f "/conf/che.properties" ]; then
-    echo "Found custom che.properties..."
-    if [ "$CHE_USER" != "root" ]; then
-      sudo chown -R ${CHE_USER} ${CHE_LOCAL_CONF_DIR}
+  # check if we have permissions to create /conf folder.
+  if [ -w / ]; then
+    export CHE_LOCAL_CONF_DIR="/conf"
+    if [ -f "/conf/che.properties" ]; then
+      echo "Found custom che.properties..."
+      if [ "$CHE_USER" != "root" ]; then
+        sudo chown -R ${CHE_USER} ${CHE_LOCAL_CONF_DIR}
+      fi
+    else
+      if [ ! -d ${CHE_LOCAL_CONF_DIR} ]; then
+          mkdir -p ${CHE_LOCAL_CONF_DIR}
+      fi
+      if [ -w ${CHE_LOCAL_CONF_DIR} ];then
+        echo "ERROR: user ${CHE_USER} does OK have write permissions to ${CHE_LOCAL_CONF_DIR}"
+        echo "Using embedded che.properties... Copying template to ${CHE_LOCAL_CONF_DIR}/che.properties"
+        cp -rf "${CHE_HOME}/conf/che.properties" ${CHE_LOCAL_CONF_DIR}/che.properties
+      else
+        echo "ERROR: user ${CHE_USER} does not have write permissions to ${CHE_LOCAL_CONF_DIR}"
+        exit 1
+      fi
     fi
   else
-    if [ ! -d /conf ]; then
-        mkdir -p /conf
+    echo "WARN: parent dir is not writeable, CHE_LOCAL_CONF_DIR will be set to ${CHE_DATA}/conf"
+    export CHE_LOCAL_CONF_DIR="${CHE_DATA}/conf"
+    if [ ! -d ${CHE_LOCAL_CONF_DIR} ]; then
+        mkdir -p ${CHE_LOCAL_CONF_DIR}
+    fi
+    if [ -w ${CHE_LOCAL_CONF_DIR} ];then
+      echo "Using embedded che.properties... Copying template to ${CHE_LOCAL_CONF_DIR}/che.properties"
+      cp -rf "${CHE_HOME}/conf/che.properties" ${CHE_LOCAL_CONF_DIR}/che.properties
+    else
+      echo "ERROR: user ${CHE_USER} does not have write permissions to ${CHE_LOCAL_CONF_DIR}"
+      exit 1
     fi
-    echo "Using embedded che.properties... Copying template to ${CHE_LOCAL_CONF_DIR}/che.properties"
-    cp -rf "${CHE_HOME}/conf/che.properties" ${CHE_LOCAL_CONF_DIR}/che.properties
   fi
 
   # Update the provided che.properties with the location of the /data mounts

plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/Exec.java

@@ -20,7 +20,7 @@ public class Exec {
     private final String[] command;
     private final String   id;
 
-    Exec(String[] command, String id) {
+    public Exec(String[] command, String id) {
         this.command = command;
         this.id = id;
     }

plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java

@@ -70,7 +70,8 @@ public void composeServiceCommandShouldBeParsedSuccessfully(String command,
         assertEquals(environment.get("MYSQL_PASSWORD"), "password");
         assertTrue(service.getExpose().containsAll(asList("4403", "5502")));
 
-        assertEquals(service.getCommand(), commandWords);
+        assertTrue(service.getCommand().containsAll(commandWords));
+        assertEquals(service.getCommand().size(), commandNumberOfWords);
     }
 
     @DataProvider(name = "validCommand")
@@ -137,7 +138,7 @@ private Object[][] validCommand() {
                 {"\"echo ${PWD}\"", asList("echo", "${PWD}"), 2},
                 {"\"(Test)\"", singletonList("(Test)"), 1},
 
-                {"", null, 1},
+                {"\"\"", singletonList(""), 1},
         };
     }
 

plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java

@@ -68,8 +68,8 @@ public Object[][] correctContentTestData() {
                  + " dev-machine: \n"
                  + "  image: codenvy/ubuntu_jdk8\n"
                  + "  environment:\n"
-                 + "   MYSQL_ROOT_PASSWORD: ",
-                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", null)
+                 + "   MYSQL_ROOT_PASSWORD: \"\"",
+                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", "")
                 },
 
                 // dictionary format, value of variable contains colon sign

plugins/plugin-docker/che-plugin-docker-machine/pom.xml

@@ -165,8 +165,11 @@
                         <exclude>**/DefaultServerEvaluationStrategyTest.java</exclude>
                         <exclude>**/LocalDockerServerEvaluationStrategy.java</exclude>
                         <exclude>**/LocalDockerServerEvaluationStrategyTest.java</exclude>
+                        <exclude>**/LocalDockerCustomServerEvaluationStrategy.java</exclude>
+                        <exclude>**/LocalDockerCustomServerEvaluationStrategyTest.java</exclude>
                         <exclude>**/DockerInstanceRuntimeInfo.java</exclude>
                         <exclude>**/DockerInstanceRuntimeInfoTest.java</exclude>
+                        <exclude>**/ServerIdleDetector.java</exclude>
                         <!-- End excluded files -->
                     </excludes>
                 </configuration>