From 9133e2241f5772ddaab378e0e66f99fb908bae8d Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Sun, 21 Jan 2024 16:42:51 +0200 Subject: [PATCH] chore(cnpg): update key name for RO pooler --- library/common-test/ci/cnpg-multi-values.yaml | 10 +++++++--- library/common-test/ci/cnpg-values.yaml | 2 +- library/common/Chart.yaml | 2 +- library/common/templates/lib/dependencies/_dbWait.tpl | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/library/common-test/ci/cnpg-multi-values.yaml b/library/common-test/ci/cnpg-multi-values.yaml index b9a603d06..770d64e72 100644 --- a/library/common-test/ci/cnpg-multi-values.yaml +++ b/library/common-test/ci/cnpg-multi-values.yaml @@ -45,7 +45,7 @@ cnpg: # the switchover of the primary primaryUpdateStrategy: unsupervised # -- enable to create extra pgbouncer for readonly access - acceptRO: false + createRO: false # -- storage size for the two pvc's per instance storage: size: "256Gi" @@ -73,7 +73,7 @@ cnpg: # the switchover of the primary primaryUpdateStrategy: unsupervised # -- enable to create extra pgbouncer for readonly access - acceptRO: true + createRO: true # -- storage size for the two pvc's per instance storage: size: "256Gi" @@ -101,7 +101,7 @@ cnpg: # the switchover of the primary primaryUpdateStrategy: unsupervised # -- enable to create extra pgbouncer for readonly access - acceptRO: true + createRO: true # -- storage size for the two pvc's per instance storage: size: "256Gi" @@ -113,3 +113,7 @@ cnpg: enablePodMonitor: true # -- contains credentials and urls output by generator creds: {} + +operator: + verify: + enabled: false diff --git a/library/common-test/ci/cnpg-values.yaml b/library/common-test/ci/cnpg-values.yaml index 90f597c1c..a9ca258df 100644 --- a/library/common-test/ci/cnpg-values.yaml +++ b/library/common-test/ci/cnpg-values.yaml @@ -45,7 +45,7 @@ cnpg: # the switchover of the primary primaryUpdateStrategy: unsupervised # -- enable to create extra pgbouncer for readonly access - acceptRO: false + createRO: false # -- storage size for the two pvc's per instance storage: size: "256Gi" diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 5e195515d..deac3b0a5 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 17.2.25 +version: 17.2.26 diff --git a/library/common/templates/lib/dependencies/_dbWait.tpl b/library/common/templates/lib/dependencies/_dbWait.tpl index 4db937991..79e8a7738 100644 --- a/library/common/templates/lib/dependencies/_dbWait.tpl +++ b/library/common/templates/lib/dependencies/_dbWait.tpl @@ -372,7 +372,7 @@ command: pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-rw do sleep 5 done - {{ if $cnpg.acceptRO }} + {{ if $cnpg.createRO }} echo "Detected RO pooler, testing RO pooler availability..." until echo "Testing database on url: {{ $cnpgName }}-pooler-ro"