wip(thredds): updated configuration #281

kalisio · Feb 4, 2022 · 90af571 · 90af571
1 parent 7aa6ed1
commit 90af571
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 20 deletions.
diff --git a/charts/thredds/templates/deployment.yaml b/charts/thredds/templates/deployment.yaml
@@ -25,6 +25,8 @@ spec:
         - name: {{ include "common.names.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            {{- include "common.environment.render" (dict "env" .Values.env "context" $) | indent 12 }}
           ports:
             - name: {{ include "common.names.name" . }}
               containerPort: 8080
@@ -36,10 +38,12 @@ spec:
               readOnly: true
               name: thredds-config
             - mountPath: /usr/local/tomcat/content/thredds/public
+              subPath: {{ .Values.publicDataSubPath }}
               readOnly: false
               name: thredds-data
             - mountPath: /usr/local/tomcat/content/thredds/cache
-              readOnly: false
+              subPath: {{ .Values.cacheDataSubPath }}
+              readOnly: false              
               name: thredds-cache              
       volumes:
         - name: tomcat-config
@@ -58,10 +62,6 @@ spec:
           {{- if .Values.dataVolume }}
           {{- include "common.tplvalues.render" ( dict "value" .Values.dataVolume "context" $ ) | nindent 10 }}
           {{- end }}
-        - name: thredds-cache
-          {{- if .Values.cacheVolume }}
-          {{- include "common.tplvalues.render" ( dict "value" .Values.cacheVolume "context" $ ) | nindent 10 }}
-          {{- end }}
         {{- if .Values.envsubstConfig }}
         {{- include "common.envsubstConfig.renderVolume" ( dict "args" .Values.envsubstConfig "context" $ ) | nindent 8 }}
         {{- end }}

diff --git a/charts/thredds/values.yaml b/charts/thredds/values.yaml
@@ -33,18 +33,36 @@ ingress:
   className: nginx
 
 env:
-  # meteoFrance FTP credentials
-  threddsXmxSize: 
-  threddsXmsSize: 
-
-volumeMounts:
-  - mountPath: /data
-    readOnly: false
-    name: nas
-    subPath: "thredds/data/mf-arpege-01"
-
-volumes:
-  - name: nas
-    nfs:
-      server: 10.201.31.124
-      path: /zpool-128564/k8sc3xplanetdev
+  # xmxSize is the maximum memory allocation pool for the Java Virtual Machine
+  xmxSize: 
+  # xmxSize is the initial memory allocation pool for the Java Virtual Machine
+  xmsSize: 
+  # tomcatUserId is the user Id to be used to run this TomCat container
+  tomcatUserId: 
+  # tomcatGroupId is the user Id to be used to run this TomCat container
+  tomcatGroupId:
+
+# tomcatConfigVolume is the specification for the volume where the TomCat config lies
+tomcatConfigVolume: {}
+#  configMap:
+#    name: '{{ include "common.names.fullname" $ }}-tomcat-config'
+
+# configVolume is the specification for the volume where the config lies
+configVolume: {}
+#  configMap:
+#    name: '{{ include "common.names.fullname" $ }}-config'
+
+# dataVolume is the specification for the volume where the data lies
+dataVolume: {}
+#  nfs:
+#    server: "host or ip"
+#    path: "/zpool-foo/partition"
+#    readOnly: true
+
+# publicDataSubPath is the sub path to the public data in the data volume
+publicDataSubPath: thredds_data/public
+
+# cacheDataSubPath is the sub path to the public data in the data volume
+cacheDataSubPath: thredds_data/cache
+
+