Devspaces combine folders (#285)

* move docs

* move configs into components

* update checluster to match default for new instance

* add combined overlay

* convert devspaces to symlink

* add autoscaling

* fix yaml lint errors

* add network policy

.wordlist-md

@@ -105,6 +105,7 @@ approver
 argocd
 argoproj
 arn
+autoscaling
 aws
 canada
 ceph

devspaces

@@ -0,0 +1 @@
+openshift-dev-spaces

devspaces/README.md → openshift-dev-spaces/README.md

@@ -13,13 +13,13 @@ The current *overlays* available are for the following channels:
 If you have cloned the `gitops-catalog` repository, you can install Red Hat OpenShift Dev Spaces based on the overlay of your choice by running from the root (`gitops-catalog`) directory.
 
 ```
-oc apply -k devspaces/operator/overlays/<channel>
+oc apply -k openshift-dev-spaces/operator/overlays/<channel>
 ```
 
 Or, without cloning:
 
 ```
-oc apply -k https://github.com/redhat-cop/gitops-catalog/devspaces/operator/overlays/<channel>
+oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-dev-spaces/operator/overlays/<channel>
 ```
 
 As part of a different overlay in your own GitOps repo:
@@ -28,5 +28,5 @@ As part of a different overlay in your own GitOps repo:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/redhat-cop/gitops-catalog/devspaces/operator/overlays/<channel>?ref=main
+  - https://github.com/redhat-cop/gitops-catalog/openshift-dev-spaces/operator/overlays/<channel>?ref=main
 ```

devspaces/aggregate/overlays/default/kustomization.yaml → openshift-dev-spaces/aggregate/overlays/allow-autoscaling/kustomization.yaml

@@ -5,5 +5,5 @@ commonAnnotations:
   argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 
 resources:
-  - ../../../instance/overlays/timeout-12m
   - ../../../operator/overlays/stable
+  - ../../../instance/overlays/allow-autoscaling

openshift-dev-spaces/instance/base/checluster.yaml

@@ -1,49 +1,36 @@
-apiVersion: org.eclipse.che/v1
+apiVersion: org.eclipse.che/v2
 kind: CheCluster
 metadata:
   name: devspaces
-  namespace: openshift-devspaces
 spec:
-  auth:
-    externalIdentityProvider: false
-    identityProviderContainerResources:
-      limits: {}
-      request: {}
-    identityProviderIngress: {}
-    identityProviderRoute: {}
-    updateAdminPassword: false
-  dashboard: {}
-  database:
-    chePostgresContainerResources:
-      limits: {}
-      request: {}
-    externalDb: false
-  devWorkspace:
-    enable: true
-  imagePuller:
-    enable: false
-    spec: {}
-  k8s: {}
-  metrics:
-    enable: true
-  server:
-    allowUserDefinedWorkspaceNamespaces: false
-    cheServerIngress: {}
-    cheServerRoute: {}
-    dashboardIngress: {}
-    dashboardRoute: {}
-    devfileRegistryIngress: {}
-    devfileRegistryRoute: {}
-    externalDevfileRegistry: false
-    externalPluginRegistry: false
-    gitSelfSignedCert: false
-    pluginRegistryIngress: {}
-    pluginRegistryRoute: {}
-    selfSignedCert: false
-    tlsSupport: false
-    useInternalClusterSVCNames: false
-    workspaceNamespaceDefault: <username>-devspaces
-  storage:
-    preCreateSubPaths: true
-    pvcClaimSize: 10Gi
-    pvcStrategy: common
+  components:
+    cheServer:
+      debug: false
+      logLevel: INFO
+    dashboard:
+      logLevel: ERROR
+    metrics:
+      enable: true
+  containerRegistry: {}
+  devEnvironments:
+    startTimeoutSeconds: 300
+    secondsOfRunBeforeIdling: -1
+    maxNumberOfWorkspacesPerUser: -1
+    containerBuildConfiguration:
+      openShiftSecurityContextConstraint: container-build
+    defaultNamespace:
+      autoProvision: true
+      template: <username>-devspaces
+    secondsOfInactivityBeforeIdling: 1800
+    storage:
+      pvcStrategy: per-user
+  gitServices: {}
+  networking:
+    auth:
+      gateway:
+        kubeRbacProxy:
+          logLevel: 0
+        oAuthProxy:
+          cookieExpireSeconds: 86400
+        traefik:
+          logLevel: INFO

openshift-dev-spaces/instance/base/kustomization.yaml

@@ -6,3 +6,4 @@ namespace: openshift-devspaces
 resources:
   - checluster.yaml
   - namespace.yaml
+  - network-policy.yaml

openshift-dev-spaces/instance/components/allow-autoscaling/README.md

@@ -0,0 +1,19 @@
+# allow-autoscaling
+
+## Purpose
+This component is designed to extend the timeout period for requesting new DevSpaces environments to start.  The 12 minute timeout can be leveraged with autoscaling nodes with GPUs.
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/allow-autoscaling
+```

openshift-dev-spaces/instance/components/allow-autoscaling/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - devworkspace-config.yaml
+
+patches:
+  - path: patch-checluster.yaml
+    target:
+      kind: CheCluster

openshift-dev-spaces/instance/components/allow-autoscaling/patch-checluster.yaml

@@ -0,0 +1,12 @@
+apiVersion: org.eclipse.che/v2
+kind: CheCluster
+metadata:
+  name: devspaces
+spec:
+  components:
+    dashboard:
+      headerMessage:
+        show: true
+        text: "Please be patient... GPUs may take up to 12 min to be available!"
+  devEnvironments:
+    StartTimeoutSeconds: 720

openshift-dev-spaces/instance/components/low-idle/README.md

@@ -0,0 +1,19 @@
+# timeout-12m
+
+## Purpose
+This component is designed to modify the amount of time a DevSpaces environment can remain idle before it is automatically shut down.
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/low-idle
+```

devspaces/aggregate/overlays/low-idle/kustomization.yaml → openshift-dev-spaces/instance/components/low-idle/kustomization.yaml

@@ -1,9 +1,5 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - ../../../instance/overlays/timeout-12m
-  - ../../../operator/overlays/stable
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 
 patches:
   - target:

openshift-dev-spaces/instance/overlays/allow-autoscaling/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: openshift-devspaces
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/allow-autoscaling
+  - ../../components/low-idle