updated helm chart to support existing secret for postgresql

charts/scsctl/.helmignore

@@ -21,4 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-values.sample.yaml

charts/scsctl/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/scsctl/templates/deployment.yaml

@@ -27,6 +27,29 @@ spec:
       serviceAccountName: {{ include "scsctl.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: create-postgres-datbase
+          image: "docker.io/bitnami/postgresql:16.0.0-debian-11-r13"
+          imagePullPolicy: Always
+          command:
+          - "/bin/sh"
+          - "-c"
+          - >
+            echo "Creating database {{ .Values.postgresql.database }} if it does not exist..." &&
+            psql -h {{ .Values.postgresql.host }} -p {{ .Values.postgresql.port }} -U {{ .Values.postgresql.username }} -lqt | cut -d \| -f 1 | grep -qw {{ .Values.postgresql.database }} || psql -h {{ .Values.postgresql.host }} -p {{ .Values.postgresql.port }} -U {{ .Values.postgresql.username }} -c "CREATE DATABASE {{ .Values.postgresql.database }};" &&
+            echo "Database {{ .Values.postgresql.database }} created or already exists. Listing all databases:" &&
+            psql -h {{ .Values.postgresql.host }} -p {{ .Values.postgresql.port }} -U {{ .Values.postgresql.username }} -l &&
+            sleep 5
+          env:
+          - name: PGPASSWORD
+            {{- if not .Values.postgresql.existingSecret }}
+            value: "{{ .Values.postgresql.password }}"
+            {{- else }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.postgresql.existingSecret.name }}
+                key: {{ .Values.postgresql.existingSecret.passwordKey }}
+            {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -37,48 +60,39 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+          args:
+            - server
           env:
-            - name: SCSCTL_PG_HOST
-              value: "{{ .Values.env.SCSCTL_PG_HOST }}"
-            - name: SCSCTL_PG_PORT
-              value: "{{ .Values.env.SCSCTL_PG_PORT }}"
-            - name: SCSCTL_PG_USER
-              value: "{{ .Values.env.SCSCTL_PG_USER }}"
-            - name: SCSCTL_PG_PASSWORD
-              value: "{{ .Values.env.SCSCTL_PG_PASSWORD }}"
-            - name: SCSCTL_PG_DATABASE
-              value: "{{ .Values.env.SCSCTL_PG_DATABASE }}"
-            - name: SCSCTL_ENVIRONMENT
-              value: "{{ .Values.env.SCSCTL_ENVIRONMENT }}"
+          - name: SCSCTL_PG_HOST
+            value: "{{ .Values.postgresql.host }}"
+          - name: SCSCTL_PG_PORT
+            value: "{{ .Values.postgresql.port }}"
+          - name: SCSCTL_PG_USER
+            value: "{{ .Values.postgresql.username }}"
+          - name: SCSCTL_PG_PASSWORD
+            {{- if not .Values.postgresql.existingSecret }}
+            value: "{{ .Values.postgresql.password }}"
+            {{- else }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Values.postgresql.existingSecret.name }}
+                key: {{ .Values.postgresql.existingSecret.passwordKey }}
+            {{- end }}
+          - name: SCSCTL_PG_DATABASE
+            value: "{{ .Values.postgresql.database }}"
+          - name: SCSCTL_ENVIRONMENT
+            value: "{{ .Values.env.SCSCTL_ENVIRONMENT }}"
 
           livenessProbe:
             httpGet:
-              path: /
+              path: /healthz
               port: http
           readinessProbe:
             httpGet:
-              path: /
+              path: /ready
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-      initContainers:
-        - name: create-postgres-datbase
-          image: "{{ .Values.initContainer.image }}"
-          imagePullPolicy: {{ .Values.initContainer.imagePullPolicy }}
-          command: ['sh', '-c', 'until pg_isready -h {{ .Values.env.SCSCTL_PG_HOST }} -p {{ .Values.env.SCSCTL_PG_PORT }}; do echo waiting for database; sleep 2; done; psql -h {{ .Values.env.SCSCTL_PG_HOST }} -p {{ .Values.env.SCSCTL_PG_PORT }} -U {{ .Values.env.SCSCTL_PG_USER }} -d {{ .Values.env.SCSCTL_PG_DATABASE }} -c "CREATE DATABASE {{ .Values.env.SCSCTL_PG_DATABASE }}";']
-          env:
-            - name: SCSCTL_PG_HOST
-              value: "{{ .Values.env.SCSCTL_PG_HOST }}"
-            - name: SCSCTL_PG_PORT
-              value: "{{ .Values.env.SCSCTL_PG_PORT }}"
-            - name: SCSCTL_PG_USER
-              value: "{{ .Values.env.SCSCTL_PG_USER }}"
-            - name: SCSCTL_PG_PASSWORD
-              value: "{{ .Values.env.SCSCTL_PG_PASSWORD }}"
-            - name: SCSCTL_PG_DATABASE
-              value: "{{ .Values.env.SCSCTL_PG_DATABASE }}"
-          resources:
-            {{- toYaml .Values.initContainer.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}