Disable PVC creation for che-multiuser master

deploy/kubernetes/helm/che/templates/deployment.yaml

@@ -35,13 +35,15 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
 {{- end }}
+{{- if not .Values.global.multiuser }}
       - name: fmp-volume-permission
         image: busybox
         command: ["chmod", "777", "/data"]
         volumeMounts: [{
               "mountPath": "/data",
               "name": "che-data-volume"
         }]
+{{- end }}
       containers:
       - env:
         - name: CHE_DOMAIN
@@ -233,17 +235,19 @@ spec:
             memory: 600Mi
           requests:
             memory: 256Mi
+{{- if not .Values.global.multiuser }}
         volumeMounts:
         - mountPath: /data
           name: che-data-volume
+      volumes:
+      - name: che-data-volume
+        persistentVolumeClaim:
+          claimName: che-data-volume
+{{- end }}
 {{- if .Values.registry }}
 {{- if and .Values.registry.password .Values.registry.username }}
       imagePullSecrets:
         - name: registry-pull-secret
 {{- end }}
 {{- end }}
       serviceAccountName: che
-      volumes:
-      - name: che-data-volume
-        persistentVolumeClaim:
-          claimName: che-data-volume

deploy/kubernetes/helm/che/templates/pvc.yaml

@@ -5,6 +5,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
+{{- if not .Values.global.multiuser }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -17,3 +18,4 @@ spec:
   resources:
     requests:
       storage: 1Gi
+{{- end }}

deploy/openshift/che-openshift.yml

@@ -2,18 +2,7 @@
 apiVersion: v1
 kind: List
 items:
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    labels:
-      app: che
-    name: che-data-volume
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: 1Gi
+#CHE_MASTER_PVC
 - apiVersion: v1
   kind: PersistentVolumeClaim
   metadata:
@@ -77,12 +66,9 @@ items:
             requests:
               memory: 256Mi
           volumeMounts:
-          - mountPath: /data
-            name: che-data-volume
+          #CHE_MASTER_VOLUME_MOUNTS
         serviceAccountName: che
         volumes:
-        - name: che-data-volume
-          persistentVolumeClaim:
-            claimName: che-data-volume
+        #CHE_MASTER_VOLUMES
     triggers:
     - type: ConfigChange

deploy/openshift/deploy_che.sh

@@ -284,6 +284,29 @@ CHE_IMAGE_SANITIZED=$(echo "${CHE_IMAGE}" | sed 's/\//\\\//g')
 CHE_KEYCLOAK_OSO_ENDPOINT=${CHE_KEYCLOAK_OSO_ENDPOINT:-${DEFAULT_CHE_KEYCLOAK_OSO_ENDPOINT}}
 KEYCLOAK_GITHUB_ENDPOINT=${KEYCLOAK_GITHUB_ENDPOINT:-${DEFAULT_KEYCLOAK_GITHUB_ENDPOINT}}
 
+CHE_MASTER_PVC="\
+- apiVersion: v1\n \
+ kind: PersistentVolumeClaim\n \
+ metadata:\n \
+   labels:\n \
+     app: che\n \
+   name: che-data-volume\n \
+ spec:\n \
+   accessModes:\n \
+   - ReadWriteOnce\n \
+   resources:\n \
+     requests:\n \
+       storage: 1Gi"
+
+CHE_MASTER_VOLUME_MOUNTS="\
+- mountPath: /data\n \
+           name: che-data-volume"
+
+CHE_MASTER_VOLUMES="\
+- name: che-data-volume\n \
+         persistentVolumeClaim:\n \
+           claimName: che-data-volume"
+
 get_che_pod_config() {
 DEFAULT_CHE_DEPLOYMENT_FILE_PATH=${BASE_DIR}/che-openshift.yml
 CHE_DEPLOYMENT_FILE_PATH=${CHE_DEPLOYMENT_FILE_PATH:-${DEFAULT_CHE_DEPLOYMENT_FILE_PATH}}
@@ -292,6 +315,10 @@ CHE_CONFIG_FILE_PATH=${CHE_CONFIG_FILE_PATH:-${DEFAULT_CHE_CONFIG_FILE_PATH}}
 cat "${CHE_DEPLOYMENT_FILE_PATH}" | \
     sed "s/          image:.*/          image: \"${CHE_IMAGE_SANITIZED}\"/" | \
     sed "s/          imagePullPolicy:.*/          imagePullPolicy: \"${IMAGE_PULL_POLICY}\"/" | \
+    if [[ "${CHE_MULTIUSER}" != "true" ]]; then
+    sed "s|#CHE_MASTER_PVC|$CHE_MASTER_PVC|" | \
+    sed "s|#CHE_MASTER_VOLUME_MOUNTS.*|$CHE_MASTER_VOLUME_MOUNTS|" | \
+    sed "s|#CHE_MASTER_VOLUMES.*|$CHE_MASTER_VOLUMES|";else cat -; fi | \
     inject_che_config "#CHE_MASTER_CONFIG" "${CHE_CONFIG_FILE_PATH}"
 }
 

dockerfiles/che/entrypoint.sh

@@ -246,10 +246,6 @@ init() {
 
   [ -z "$CHE_DATABASE" ] && export CHE_DATABASE=${CHE_DATA}/storage
   [ -z "$CHE_TEMPLATE_STORAGE" ] && export CHE_TEMPLATE_STORAGE=${CHE_DATA}/templates
-  [ -z "$CHE_WORKSPACE_AGENT_DEV" ] && export CHE_WORKSPACE_AGENT_DEV=${CHE_DATA_HOST}/lib/ws-agent.tar.gz
-  [ -z "$CHE_WORKSPACE_TERMINAL__LINUX__AMD64" ] && export CHE_WORKSPACE_TERMINAL__LINUX__AMD64=${CHE_DATA_HOST}/lib/linux_amd64/terminal
-  [ -z "$CHE_WORKSPACE_TERMINAL__LINUX__ARM7" ] && export CHE_WORKSPACE_TERMINAL__LINUX__ARM7=${CHE_DATA_HOST}/lib/linux_arm7/terminal
-  [ -z "$CHE_WORKSPACE_EXEC__LINUX__AMD64" ] && export CHE_WORKSPACE_EXEC__LINUX__AMD64=${CHE_DATA_HOST}/lib/linux_amd64/exec
 
   perform_database_migration
 
@@ -264,10 +260,8 @@ init() {
   [ -z "$CHE_WORKSPACE_STORAGE" ] && export CHE_WORKSPACE_STORAGE="${CHE_DATA_HOST}/workspaces"
   [ -z "$CHE_WORKSPACE_STORAGE_CREATE_FOLDERS" ] && export CHE_WORKSPACE_STORAGE_CREATE_FOLDERS=false
 
-  # Move files from /lib to /lib-copy.  This puts files onto the host.
-  rm -rf ${CHE_DATA}/lib/*
-  mkdir -p ${CHE_DATA}/lib  
-  cp -rf ${CHE_HOME}/lib/* "${CHE_DATA}"/lib
+  #Recursively removes the legacy che-data/lib folder with agents inside(will be removed in future versions)
+  rm -rf ${CHE_DATA}/lib
 
   # Cleanup no longer in use stacks folder, accordance to a new loading policy.
   if [[ -d "${CHE_DATA}"/stacks ]];then

dockerfiles/init/modules/che/templates/che.env.erb

@@ -51,9 +51,6 @@ CHE_LOGS_DIR=/logs
 CHE_WORKSPACE_LOGS=/logs/machines
 CHE_TEMPLATE_STORAGE=/data/templates
 
-CHE_WORKSPACE_TERMINAL__LINUX__AMD64=<%= scope.lookupvar('che::che_instance') %>/data/lib/linux_amd64/terminal
-CHE_WORKSPACE_TERMINAL__LINUX__ARM7=<%= scope.lookupvar('che::che_instance') %>/data/lib/linux_arm7/terminal
-CHE_WORKSPACE_AGENT_DEV=<%= scope.lookupvar('che::che_instance') %>/data/lib/ws-agent.tar.gz
 
 <% if ! @che_http_proxy.empty? or ! @che_https_proxy.empty? -%>
 JAVA_HTTP_PROXY_SET=-Dhttp.proxySet=true