Continue charts

Author: meier-rene

charts/custom-values.yaml

@@ -6,12 +6,10 @@ massbank3-export-service:
   host: msbi.ipb-halle.de
   pathPrefix: MassBank3
 
-# Overwrite ingress path properties for massbank3-server
 massbank3-server:
-  ingress:
-    hosts:
-      - host: msbi.ipb-halle.de
-        paths:
-          - path: /MassBank3-api(/|$)(.*)
-            pathType: ImplementationSpecific
+  host: msbi.ipb-halle.de
+  pathPrefix: MassBank3
+  massbank3-similarity-service:
+    host: msbi.ipb-halle.de
+    pathPrefix: MassBank3
 

charts/massbank3-export-service/values.yaml

@@ -60,7 +60,7 @@ service:
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
   enabled: true
-  className: nginx
+  className: "nginx"
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2

charts/massbank3-frontend/templates/configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "massbank3-frontend.labels" . | nindent 4 }}
 data:
-  MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api/v1"
+  MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api"
   MB3_API_URL_INTERNAL: "http://massbank3-server-service:8080"
   MB3_FRONTEND_URL: "https://{{ .Values.host }}"
   MB3_FRONTEND_BASE_URL: "/{{ .Values.pathPrefix }}/"

charts/massbank3-server/templates/configmap.yaml

@@ -15,4 +15,4 @@ data:
   SIMILARITY_SERVICE_COSINE_PORT: "8080"
   EXPORT_SERVICE_HOST: "massbank3-export-service-service"
   EXPORT_SERVICE_PORT: "8080"
-  MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api/v1"
+  MB3_API_URL: "https://{{ .Values.host }}/{{ .Values.pathPrefix }}-api"

charts/massbank3-server/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-server/values.yaml

@@ -1,6 +1,9 @@
 # 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"
+
 image:
   repository: ipbhalle/massbank3-server
   tag: "dev"
@@ -101,9 +104,9 @@ ingress:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
   hosts:
-    - host: msbi.ipb-halle.de
+    - host: "{{ .Values.host }}"
       paths:
-        - path: /MassBank-api(/|$)(.*)
+        - path: "/{{ .Values.pathPrefix }}-api(/|$)(.*)"
           pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls

charts/massbank3-similarity-service/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-similarity-service/values.yaml

@@ -5,6 +5,9 @@
 # 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"
+
 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
 image:
   repository: quay.io/massbank/massbank3-similarity-service
@@ -59,14 +62,14 @@ service:
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
   enabled: true
-  className: nginx
+  className: "nginx"
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
   hosts:
-    - host: msbi.ipb-halle.de
+    - host: "{{ .Values.host }}"
       paths:
-        - path: /MassBank-similarity(/|$)(.*)
+        - path: "/{{ .Values.pathPrefix }}-similarity(/|$)(.*)"
           pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls