From f4bdd1b62aa77c86a09f7c448c343e35ca60de56 Mon Sep 17 00:00:00 2001
From: Julien Bouquillon <julien.bouquillon@sg.social.gouv.fr>
Date: Fri, 7 Aug 2020 18:45:22 +0200
Subject: [PATCH] fix(k8s): restore waitForPg delays (#115)

---
 .../__tests__/__snapshots__/--env dev.ts.snap             | 8 ++++----
 .../__tests__/__snapshots__/--env preprod.ts.snap         | 8 ++++----
 .../__tests__/__snapshots__/--env prod.ts.snap            | 8 ++++----
 src/utils/waitForPostgres.ts                              | 4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
index 4cc15922f4..2d5b2df8e7 100644
--- a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap	
+++ b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap	
@@ -110,14 +110,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
@@ -364,14 +364,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
index 0b50c67215..7bb20bfabf 100644
--- a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap	
+++ b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap	
@@ -110,14 +110,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
@@ -364,14 +364,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
index cf82fe6332..8c4463eaa3 100644
--- a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap	
+++ b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap	
@@ -92,14 +92,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
@@ -348,14 +348,14 @@ spec:
             - '-c'
             - >
 
-              retry=5; # 5s * (12 * 10) = 10min
+              retry=120; # 5s * (12 * 10) = 10min
 
               while ! psql -c \\"SELECT VERSION();\\" > /dev/null 2> /dev/null && [
               $retry -gt 0 ];
                 do
                   echo \\"Waiting for Postgres to go Green ($(( retry )))\\" ;
                   retry=$(( $retry-1 ));
-                  sleep 1s ;
+                  sleep 5s ;
                 done ;
               if [ $retry -eq 0 ]; then
                   echo \\"Not Ready\\";
diff --git a/src/utils/waitForPostgres.ts b/src/utils/waitForPostgres.ts
index e0b1c33b4e..323d914525 100644
--- a/src/utils/waitForPostgres.ts
+++ b/src/utils/waitForPostgres.ts
@@ -7,12 +7,12 @@ interface WaitForPostgresParams {
 }
 
 const script = `
-retry=5; # 5s * (12 * 10) = 10min
+retry=120; # 5s * (12 * 10) = 10min
 while ! psql -c "SELECT VERSION();" > /dev/null 2> /dev/null && [ $retry -gt 0 ];
   do
     echo "Waiting for Postgres to go Green ($(( retry )))" ;
     retry=$(( $retry-1 ));
-    sleep 1s ;
+    sleep 5s ;
   done ;
 if [ $retry -eq 0 ]; then
     echo "Not Ready";