fix backend 503 error

Author: 7va

helm/Chart.yaml

@@ -2,6 +2,6 @@ apiVersion: v2
 name: opensampl
 description: Helm chart for OpenSAMPL (Postgres + Backend + Grafana + Migrations)
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: "1.0.0"
 icon: https://raw.githubusercontent.com/ORNL/OpenSAMPL/main/docs/logo.png

helm/templates/backend/deployment.yaml

@@ -35,10 +35,21 @@ spec:
           image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}"
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
           ports:
-            - containerPort: {{ .Values.backend.port }}
+            - containerPort: 8000
           env:
             - name: DATABASE_URL
-              value: postgresql://{{ .Values.db.username }}:{{ .Values.db.password }}@{{ include "opensampl.fullname" . }}-db:{{ .Values.db.port }}/{{ .Values.db.database }}
+              value: postgresql://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@{{ include "opensampl.fullname" . }}-db:{{ .Values.db.port }}/{{ .Values.db.database }}
+            - name: POSTGRES_USER
+              value: {{ .Values.db.username }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "opensampl.fullname" . }}-db-secret
+                  key: POSTGRES_PASSWORD
+            - name: BACKEND_LOG_LEVEL
+              value: {{ .Values.backend.logLevel | default "INFO" | quote }}
+            - name: USE_API_KEY
+              value: {{ .Values.backend.useApiKey | default "false" | quote }}
             {{- with .Values.backend.env }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
+            {{- end }}

helm/templates/backend/service.yaml

@@ -7,8 +7,10 @@ metadata:
 spec:
   type: ClusterIP
   selector:
-    app: {{ include "opensampl.name" . }}-backend
+    app.kubernetes.io/name: {{ include "opensampl.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    role: backend
   ports:
     - name: http
-      port: 80
+      port: {{ .Values.backend.service.port }}
       targetPort: 8000

helm/values-mariner.yaml

@@ -25,6 +25,9 @@ backend:
   service:
     type: ClusterIP
     port: 8000
+    logLevel: "INFO"
+    useApiKey: false
+    env: []
 
 # Grafana configuration
 grafana:
@@ -36,7 +39,7 @@ grafana:
   port: 3000
   service:
     type: ClusterIP
-  rootUrl: "https://opensampl-test.ornl.gov/grafana/"
+  rootUrl: "https://opensampl-test.ornl.gov/grafana"
   serveFromSubPath: true
 
 # Migrations (disabled until ready)
@@ -53,15 +56,15 @@ ingress:
   hosts:
     - host: opensampl-test.ornl.gov  
       paths:
-        - path: /api(/|$)(.*)
-          pathType: Prefix
-          service: backend
-        - path: /docs(/|$)(.*)
-          pathType: Prefix
-          service: backend
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          service: grafana
+       - path: /api
+         pathType: prefix
+         service: backend
+       - path: /docs
+         pathType: Prefix
+         service: backend
+       - path: /grafana(/|$)(.*)
+         pathType: Prefix
+         service: grafana
   tls:
     - secretName: opensampl-tls
       hosts: