wip(charts): Provides helm chart for most of the components #281

kalisio · Jan 28, 2022 · 272f43c · 272f43c
1 parent 6391fbf
commit 272f43c
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 11 deletions.
diff --git a/charts/common/templates/_krawlerjob.yaml → ...ts/common/templates/_krawler-cronjob.yaml b/charts/common/templates/_krawlerjob.yaml → ...ts/common/templates/_krawler-cronjob.yaml
@@ -1,4 +1,4 @@
-{{- define "common.krawlerjob" -}}
+{{- define "common.krawler-cronjob" -}}
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
@@ -26,5 +26,13 @@ spec:
                 - name: CRON
                   value: "" 
               {{- include "common.environment.render" . | indent 16 }}
+              {{- if .Values.volumeMounts }}
+              volumeMounts:
+                {{- include "common.tplvalues.render" ( dict "value" .Values.volumeMounts "context" $ ) | nindent 14 }}
+              {{- end }}
           restartPolicy: Never
+    {{- if .Values.volumes }}
+    volumes:
+      {{- include "common.tplvalues.render" ( dict "value" .Values.volumes "context" $ ) | nindent 8 }}
+    {{- end }}
 {{- end -}}
diff --git a/charts/k-centipede/templates/cronjob..yaml b/charts/k-centipede/templates/cronjob..yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-hubeau-observations/templates/cronjob..yaml b/charts/k-hubeau-observations/templates/cronjob..yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-hubeau-stations/templates/cronjob..yaml b/charts/k-hubeau-stations/templates/cronjob..yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-meteoradar/templates/cronjob..yaml b/charts/k-meteoradar/templates/cronjob..yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-openaq/templates/cronjob..yaml b/charts/k-openaq/templates/cronjob..yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-openradiation/templates/cronjob.yaml b/charts/k-openradiation/templates/cronjob.yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-teleray/templates/cronjob.yaml b/charts/k-teleray/templates/cronjob.yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k-vigicrues/templates/krawlerjob.yaml b/charts/k-vigicrues/templates/krawlerjob.yaml
@@ -1 +1 @@
-{{- include "common.krawlerjob" . }}
+{{- include "common.krawler-cronjob" . }}
diff --git a/charts/k2/templates/deployment.yaml b/charts/k2/templates/deployment.yaml
@@ -30,10 +30,27 @@ spec:
           ports:
             - name: {{ include "common.names.name" . }}
               containerPort: 8080
+          volumeMounts:
+            - mountPath: /mbtiles
+              readOnly: true
+              name: k2-data
+              {{- if .Values.dataMount }}
+              {{- include "common.tplvalues.render" ( dict "value" .Values.dataMount "context" $ ) | nindent 14 }}
+              {{- end }}
           livenessProbe:
             httpGet:
               path: /healthcheck
               port: {{ include "common.names.name" . }}
             initialDelaySeconds: 30
-            periodSeconds: 15
-
+            periodSeconds: 15              
+      volumes:
+        - name: k2-data
+          {{- if .Values.dataVolume }}
+          {{- include "common.tplvalues.render" ( dict "value" .Values.dataVolume "context" $ ) | nindent 10 }}
+          {{- end }}
+        {{- if .Values.envsubstConfig }}
+        {{- include "common.envsubstConfig.renderVolume" ( dict "args" .Values.envsubstConfig "context" $ ) | nindent 8 }}
+        {{- end }}
+        {{- if .Values.extraVolumes }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 8 }}
+        {{- end }}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{- include "common.krawlerjob" . }}
		{{- include "common.krawler-cronjob" . }}