Added the ability to be able to configure workspace using an externally created configmap, changed default mount point and path for workspace config

Author: andrewgkew

charts/orbital/templates/configmap-orbital-workspace.yaml

@@ -0,0 +1,9 @@
+{{- if and (and (.Values.orbital.workspace.enabled) (not (empty .Values.orbital.workspace.config))) ( not (.Values.orbital.workspace.configSuppliedAsConfigMap)) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "orbital.fullname" . }}-workspace-config
+data:
+  workspaces.conf: |
+    {{ .Values.orbital.workspace.config | nindent 4 }}
+{{- end}}

charts/orbital/templates/configmap-orbital.yaml

@@ -3,10 +3,6 @@ kind: ConfigMap
 metadata:
   name: {{ template "orbital.fullname" . }}-config
 data:
-  {{- if and (.Values.orbital.workspace.enabled) (not (empty .Values.orbital.workspace.config)) }}
-  workspaces.conf: |
-    {{ .Values.orbital.workspace.config | nindent 4 }}
-  {{- end}}
   {{- if .Values.orbital.project.enabled }}
   taxi.conf: |
     {{ .Values.orbital.project.config | nindent 4 }}

charts/orbital/templates/deployment-orbital.yaml

@@ -112,6 +112,8 @@ spec:
             mountPath: /opt/service/config
           - name: orbital-services-config
             mountPath: /opt/service/config/services
+          - name: orbital-workspace-config
+            mountPath: /opt/service/config/workspace
         {{- if .Values.userDefinedVolumeMounts }}
         {{- toYaml .Values.userDefinedVolumeMounts | nindent 10 }}
         {{- end }}
@@ -163,6 +165,13 @@ spec:
         - name: orbital-config
           configMap:
             name: {{ template "orbital.fullname" . }}-config
+        - name: orbital-workspace-config
+          configMap:
+        {{- if .Values.orbital.workspace.configSuppliedAsConfigMap }}
+            name: {{ .Values.orbital.workspace.configMap }}
+        {{- else }}
+            name: {{ template "orbital.fullname" . }}-workspace-config
+        {{- end }}
         - name: orbital-services-config
           configMap:
             name: {{ template "orbital.fullname" . }}-services-config

charts/orbital/values.yaml

@@ -60,7 +60,9 @@ orbital:
         }
   workspace:
     enabled: false
-    path: /opt/service/config/workspaces.conf
+    path: /opt/service/config/workspace/workspaces.conf
+    configSuppliedAsConfigMap: false
+    configMap: "" #right now only 1 config map is allowed for workspace config
     config: |-
       git {
        # The root directory where all git repositories are cloned to