Resolves qameta/infra#85

qameta · Sep 21, 2023 · 64c4570 · 64c4570
1 parent b51b3c5
commit 64c4570
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,4 +26,4 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_PASS }}
           repoName: allure-testops
           chart: charts/allure-testops
-          version: 2.0.4
+          version: 2.1.0
diff --git a/charts/allure-testops/Chart.yaml b/charts/allure-testops/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: allure-testops
-version: 2.0.4
+version: 2.1.0
 appVersion: 4.20.3
 
 description: Allure TestOps

diff --git a/charts/allure-testops/templates/_helpers.tpl b/charts/allure-testops/templates/_helpers.tpl
@@ -89,15 +89,23 @@
 {{- if .Values.postgresql.enabled }}
   {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" }}
 {{- else }}
-  {{- print .Values.postgresql.external.uaaHost }}
+  {{- if .Values.postgresql.external.pgbouncer.enabled }}
+    {{- print "localhost"}}
+  {{- else }}
+    {{- print .Values.postgresql.external.uaaHost }}
+  {{- end }}
 {{- end }}
 {{- end }}
 
 {{- define "uaaDBPort" }}
 {{- if .Values.postgresql.enabled }}
   {{- printf "%.f" .Values.postgresql.primary.service.ports.postgresql }}
 {{- else }}
+  {{- if .Values.postgresql.external.pgbouncer.enabled }}
+    {{- print "5432"}}
+  {{- else }}
     {{- print .Values.postgresql.external.uaaPort }}
+  {{- end }}
 {{- end }}
 {{- end }}
 {{- define "uaaDBName" }}
@@ -112,15 +120,23 @@
 {{- if .Values.postgresql.enabled }}
   {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" }}
 {{- else }}
-  {{- print .Values.postgresql.external.reportHost }}
+  {{- if .Values.postgresql.external.pgbouncer.enabled }}
+    {{- print "localhost"}}
+  {{- else }}
+    {{- print .Values.postgresql.external.reportHost }}
+  {{- end }}
 {{- end }}
 {{- end }}
 
 {{- define "reportDBPort" }}
 {{- if .Values.postgresql.enabled }}
   {{- printf "%.f" .Values.postgresql.primary.service.ports.postgresql }}
 {{- else }}
-   {{- print .Values.postgresql.external.reportPort}}
+    {{- if .Values.postgresql.external.pgbouncer.enabled }}
+      {{- print "5432" }}
+    {{- else }}
+      {{- print .Values.postgresql.external.reportPort}}
+    {{- end }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/allure-testops/templates/allure/report-statefulset.yaml b/charts/allure-testops/templates/allure/report-statefulset.yaml
@@ -51,9 +51,15 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
+  {{- if .Values.postgresql.external.pgbouncer.enabled }}
+          command: [ 'sh', '-c',
+            'until pg_isready -h {{ .Values.postgresql.external.reportHost }} -p {{ .Values.postgresql.external.reportPort }};
+             do echo waiting for database; sleep 2; done;' ]
+  {{- else }}
           command: [ 'sh', '-c',
             'until pg_isready -h {{ template "reportDBHost" . }} -p {{ template "reportDBPort" . }};
              do echo waiting for database; sleep 2; done;' ]
+  {{- end }}
 {{- $secret_name := include "allure-testops.secret.name" . }}
       containers:
         - name: {{ template "allure-testops.report.fullname" . }}
@@ -207,6 +213,43 @@ spec:
             - name: vault-creds
               mountPath: "/mnt/secrets-store"
               readOnly: true
+{{- end }}
+{{- if .Values.postgresql.external.pgbouncer.enabled }}
+        - name: pgbouncer
+          image: {{ .Values.postgresql.external.pgbouncer.image | quote }}
+          imagePullPolicy: {{ .Values.registry.pullPolicy }}
+          volumeMounts:
+            - name: vault-creds
+              mountPath: "/mnt/secrets-store"
+              readOnly: true
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - /bin/sh
+                  - -c
+                  - killall -INT pgbouncer && sleep 120
+          env:
+            - name: DB_HOST
+              value: {{ .Values.postgresql.external.reportHost }}
+            - name: DB_PORT
+              value: {{ .Values.postgresql.external.reportPort | quote }}
+            - name: DB_NAME
+              value: {{ .Values.postgresql.external.reportDbName }}
+            - name: POOL_MODE
+              value: transaction
+            - name: SERVER_RESET_QUERY
+              value: DISCARD ALL
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret_name }}
+                  key: reportDbUser
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret_name }}
+                  key: reportDbPass
 {{- end }}
       volumes:
 {{- if eq .Values.fs.type "CSI" }}

diff --git a/charts/allure-testops/templates/allure/uaa-dep.yaml b/charts/allure-testops/templates/allure/uaa-dep.yaml
@@ -50,9 +50,15 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
+{{- if .Values.postgresql.external.pgbouncer.enabled }}
+          command: [ 'sh', '-c',
+            'until pg_isready -h {{ .Values.postgresql.external.uaaHost }} -p {{ .Values.postgresql.external.uaaPort }};
+             do echo waiting for database; sleep 2; done;' ]
+  {{- else }}
           command: [ 'sh', '-c',
             'until pg_isready -h {{ template "uaaDBHost" . }} -p {{ template "uaaDBPort" . }};
              do echo waiting for database; sleep 2; done;' ]
+  {{- end }}
       containers:
         - name: {{ template "allure-testops.uaa.fullname" . }}
           image: "{{ template "getImageRegistry" . }}{{ .Values.uaa.image }}:{{ .Values.version | default .Chart.AppVersion }}"
@@ -274,6 +280,43 @@ spec:
             - name: vault-creds
               mountPath: "/mnt/secrets-store"
               readOnly: true
+{{- if .Values.postgresql.external.pgbouncer.enabled }}
+        - name: pgbouncer
+          image: {{ .Values.postgresql.external.pgbouncer.image | quote }}
+          imagePullPolicy: {{ .Values.registry.pullPolicy }}
+          volumeMounts:
+            - name: vault-creds
+              mountPath: "/mnt/secrets-store"
+              readOnly: true
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - /bin/sh
+                  - -c
+                  - killall -INT pgbouncer && sleep 120
+          env:
+            - name: DB_HOST
+              value: {{ .Values.postgresql.external.uaaHost }}
+            - name: DB_PORT
+              value: {{ .Values.postgresql.external.uaaPort | quote }}
+            - name: DB_NAME
+              value: {{ .Values.postgresql.external.uaaDbName }}
+            - name: POOL_MODE
+              value: transaction
+            - name: SERVER_RESET_QUERY
+              value: DISCARD ALL
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret_name }}
+                  key: uaaDbUser
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret_name }}
+                  key: uaaDbPass
+{{- end }}
       volumes:
         - name: vault-creds
           csi:

diff --git a/charts/allure-testops/values.yaml b/charts/allure-testops/values.yaml
@@ -203,6 +203,9 @@ postgresql:
     reportDbName: report
     reportUsername: report
     reportPassword: secret
+    pgbouncer:
+      enabled: false
+      image: docker.io/edoburu/pgbouncer:1.20.1-p0
   # This works for built-in postgres only provided with this chart. For external DB you need to execute these manually when creating the databases
   primary:
     initdb: