SS-342 and SS-1167 allow custom commands for custom apps (#58)

ScilifelabDataCentre · Oct 16, 2024 · bded0be · bded0be
1 parent d3b07a5
commit bded0be
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/apps/custom-app/Chart.yaml b/apps/custom-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.1"
 description: A Helm chart for a standard serve app
 name: custom-app
-version: 1.0.2
+version: 1.1.0
 maintainers:
   - name: Team Whale
     email: [email protected]
diff --git a/apps/custom-app/templates/deployment.yaml b/apps/custom-app/templates/deployment.yaml
@@ -34,8 +34,10 @@ spec:
           type: RuntimeDefault
         fsGroup: {{ .Values.appconfig.userid | default 1000 }}
 
-      {{- if .Values.apps.volumeK8s }}
+      {{- if or .Values.apps.volumeK8s .Values.appconfig.startupCommand }}
       initContainers:
+      {{- end}}
+      {{- if .Values.apps.volumeK8s }}
       - name: copy-to-pvc
         image: {{ .Values.appconfig.image }}
         imagePullPolicy: IfNotPresent
@@ -54,16 +56,34 @@ spec:
         {{- range $key, $value := .Values.apps.volumeK8s }}
         - name: {{ $key }}
           mountPath: /tmp
+        {{- end }}
       {{- end }}
-      {{- end }}
+      {{- if .Values.appconfig.startupCommand}}
+      - name: create-startup-script
+        image: busybox
+        command:
+          - /bin/sh
+          - -c
+          - |
+            echo "{{ .Values.appconfig.startupCommand }}" > /scripts/custom-start-script.sh;
+            chmod +x /scripts/custom-start-script.sh;
+        volumeMounts:
+          - name: startup-script
+            mountPath: /scripts
+      {{- end}}
       containers:
       - name: {{ .Values.appname }}
         image: {{ .Values.appconfig.image }}
         imagePullPolicy: IfNotPresent
         command:
           - /bin/sh
           - -c
+          {{- if .Values.appconfig.startupCommand }}
+          - /scripts/custom-start-script.sh;
+          {{- else }}
           - ./start-script.sh;
+          {{- end }}
+
         ports:
           - containerPort: {{ .Values.appconfig.port }}
         securityContext:
@@ -77,20 +97,32 @@ spec:
               - all
         resources:
           {{- toYaml .Values.flavor | nindent 10 }}
-        {{- if .Values.apps.volumeK8s }}
+        {{- if or .Values.appconfig.startupCommand .Values.apps.volumeK8s }}
         volumeMounts:
+        {{- end }}
+        {{- if .Values.apps.volumeK8s }}
         {{- range $key, $value := .Values.apps.volumeK8s }}
         - name: {{ $key }}
           mountPath: {{ $.Values.appconfig.path }}
         {{- end }}
         {{- end }}
+        {{- if .Values.appconfig.startupCommand}}
+        - name: startup-script
+          mountPath: /scripts
+        {{- end}}
       terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirst
-      {{ if .Values.apps.volumeK8s }}
+      {{ if or .Values.apps.volumeK8s .Values.appconfig.startupCommand }}
       volumes:
+      {{- end }}
+      {{ if .Values.apps.volumeK8s }}
       {{- range $key, $value := .Values.apps.volumeK8s }}
       - name: {{ $key }}
         persistentVolumeClaim:
           claimName: {{ $value.release }}
       {{- end }}
       {{ end }}
+      {{- if .Values.appconfig.startupCommand}}
+      - name: startup-script
+        emptyDir: { }
+      {{- end}}
diff --git a/apps/custom-app/values.yaml b/apps/custom-app/values.yaml
@@ -17,6 +17,7 @@ appconfig:
   port: 8501
   image: ghcr.io/scilifelabdatacentre/example-streamlit:240312-1531
   path: /home
+  startupCommand: {}
 
 service:
   name: customapp-svc