From dee14323e614df6c06db7315a1d690456c8faeb1 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 21 Feb 2022 14:03:24 +0100
Subject: [PATCH 1/4] parametrize postgres version

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d146105..4f70b8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ services:
   - docker:18-dind
 
 variables:
-  POSTGRESQL_VERSION: "10.15.0"
+  POSTGRESQL_VERSION: "10.15"
   CHART_VERSION: "10.2.1"
 
 build:
@@ -20,7 +20,7 @@ build:
     LC_COLLATE: POSIX
   services:
     - docker:18-dind
-    - name: postgres:10.1
+    - name: postgres:${POSTGRESQL_VERSION}
       alias: db-test
   script:
     - if [ $CI_COMMIT_REF_SLUG == "master" ]; then export RUN_TEST="1"; fi
-- 
GitLab


From fc3361f635c311e441dd1b7a7710368aa4dfbab4 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 21 Feb 2022 14:24:06 +0100
Subject: [PATCH 2/4] use same image for test and app

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f70b8f..7687ad7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ services:
   - docker:18-dind
 
 variables:
-  POSTGRESQL_VERSION: "10.15"
+  POSTGRESQL_VERSION: "10.15.0"
   CHART_VERSION: "10.2.1"
 
 build:
@@ -20,7 +20,7 @@ build:
     LC_COLLATE: POSIX
   services:
     - docker:18-dind
-    - name: postgres:${POSTGRESQL_VERSION}
+    - name: bitnami/postgresql:${POSTGRESQL_VERSION}
       alias: db-test
   script:
     - if [ $CI_COMMIT_REF_SLUG == "master" ]; then export RUN_TEST="1"; fi
-- 
GitLab


From e554f356885901f0cf81b655b779688650c1f7ba Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 21 Feb 2022 14:30:06 +0100
Subject: [PATCH 3/4] use (almost) same version

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7687ad7..e498fb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,8 @@ services:
   - docker:18-dind
 
 variables:
-  POSTGRESQL_VERSION: "10.15.0"
+  POSTGRESQL_VERSION: "10.15"
+  POSTGRESQL_VERSION_HELM: "${POSTGRESQL_VERSION}.0"
   CHART_VERSION: "10.2.1"
 
 build:
@@ -20,7 +21,7 @@ build:
     LC_COLLATE: POSIX
   services:
     - docker:18-dind
-    - name: bitnami/postgresql:${POSTGRESQL_VERSION}
+    - name: postgres:${POSTGRESQL_VERSION}
       alias: db-test
   script:
     - if [ $CI_COMMIT_REF_SLUG == "master" ]; then export RUN_TEST="1"; fi
@@ -102,7 +103,7 @@ build:
     - envsubst < k8s/config-map.yaml | kubectl apply -n $NAMESPACE -f -
     - >
       helm upgrade --install db${STORAGE_SUFFIX} bitnami/postgresql --version $CHART_VERSION --namespace=$NAMESPACE
-      --set image.tag=$POSTGRESQL_VERSION
+      --set image.tag=$POSTGRESQL_VERSION_HELM
       --set persistence.storageClass='isilon'
       --set persistence.enabled=true
       --set persistence.size="6Gi"
-- 
GitLab


From 30a2fc626e121e798ef545181456fa7b9df31fe3 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 21 Feb 2022 15:45:51 +0100
Subject: [PATCH 4/4] use helm 11.0.6 with postgres 14

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e498fb4..99a674c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@ services:
   - docker:18-dind
 
 variables:
-  POSTGRESQL_VERSION: "10.15"
+  POSTGRESQL_VERSION: "14.1"
   POSTGRESQL_VERSION_HELM: "${POSTGRESQL_VERSION}.0"
-  CHART_VERSION: "10.2.1"
+  CHART_VERSION: "11.0.6"
 
 build:
   stage: build
@@ -108,10 +108,10 @@ build:
       --set persistence.enabled=true
       --set persistence.size="6Gi"
       --set image.pullPolicy='Always'
-      --set postgresqlUsername='postgres'
-      --set postgresqlPostgresPassword="$POSTGRES_PASSWORD"
-      --set postgresqlPassword="$POSTGRES_PASSWORD"
-      --set postgresqlDatabase='viralhostrangedb'
+      --set auth.username='postgres'
+      --set auth.postgresPassword=${POSTGRES_PASSWORD}
+      --set auth.password=${POSTGRES_PASSWORD}
+      --set auth.database='viralhostrangedb'
       --set primary.podLabels.branch=branch${STORAGE_SUFFIX}
       --set primary.podLabels.app=postgres-app
       --set fullnameOverride="db${STORAGE_SUFFIX}"
-- 
GitLab