Continue chart development

Author: meier-rene

charts/custom-values.yaml

@@ -1,11 +1,6 @@
 # Overwrite ingress path properties for massbank3-frontend
 host: msbi.ipb-halle.de
-ingress:
-  hosts:
-    - host: msbi.ipb-halle.de
-      paths:
-        - path: /MassBank3(/|$)(.*)
-          pathType: ImplementationSpecific
+pathPrefix: MassBank3
 
 # Overwrite ingress path properties for massbank3-server
 massbank3-server:

charts/massbank3-frontend/templates/NOTES.txt

@@ -2,7 +2,7 @@
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ tpl $host.host $ }}{{ tpl .path $ }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}

charts/massbank3-frontend/templates/configmap.yaml

@@ -6,12 +6,12 @@ metadata:
     {{- include "massbank3-frontend.labels" . | nindent 4 }}
 data:
   MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api/v1"
-  MB3_API_URL_INTERNAL: "http://{{ .Values.host }}:8080"
+  MB3_API_URL_INTERNAL: "http://massbank3-server-service:8080"
   MB3_FRONTEND_URL: "https://{{ .Values.host }}"
   MB3_FRONTEND_BASE_URL: "/{{ .Values.pathPrefix }}/"
   MB3_FRONTEND_VERSION: "3.0.0 (beta)"
-  EXPORT_SERVICE_URL: "https://{{ .Values.host }}/MassBank-export"
-  EXPORT_SERVICE_URL_INTERNAL: "http://{{ .Values.host }}:8080"
+  EXPORT_SERVICE_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-export"
+  EXPORT_SERVICE_URL_INTERNAL: "http://massbank3-export-service-service:8080"
   GOOGLE_SEARCH_CONSOLE_KEY: "4aoZgYg2lHeh7TlOxtyVzjHa3YJirrsEHPqwSU3luoU"
   DISTRIBUTOR_TEXT: "This website is hosted and distributed by the Leibniz Institute of Plant Biochemistry, Halle (Saale), Germany."
   DISTRIBUTOR_URL: "https://www.ipb-halle.de/kontakt/impressum"

charts/massbank3-frontend/templates/deployment.yaml

@@ -49,11 +49,11 @@ spec:
               protocol: TCP
           {{- with .Values.livenessProbe }}
           livenessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
           {{- with .Values.readinessProbe }}
           readinessProbe:
-            {{- toYaml . | nindent 12 }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
           {{- with .Values.resources }}
           resources:

charts/massbank3-frontend/templates/ingress.yaml

@@ -25,11 +25,11 @@ spec:
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ tpl .host $ | quote }}
       http:
         paths:
           {{- range .paths }}
-          - path: {{ .path }}
+          - path: {{ tpl .path $ }}
             {{- with .pathType }}
             pathType: {{ . }}
             {{- end }}

charts/massbank3-frontend/values.yaml

@@ -5,8 +5,8 @@
 # This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
 replicaCount: 1
 
-host: msbi.ipb-halle.de
-pathPrefix: MassBank
+host: "msbi.ipb-halle.de"
+pathPrefix: "MassBank"
 
 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
 image:
@@ -66,9 +66,9 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
-    - host: msbi.ipb-halle.de
+    - host: "{{ .Values.host }}"
       paths:
-        - path: /MassBank(/|$)(.*)
+        - path: "/{{ .Values.pathPrefix }}(/|$)(.*)"
           pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
@@ -90,11 +90,11 @@ resources: {}
 # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 livenessProbe:
   httpGet:
-    path: /MassBank/
+    path: "/{{ .Values.pathPrefix }}/"
     port: http
 readinessProbe:
   httpGet:
-    path: /MassBank/
+    path: "/{{ .Values.pathPrefix }}/"
     port: http
 
 # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/