aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-03-25 06:22:50 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-25 06:22:50 +0000
commitb8be171914389631c6f0c41929119436a9d1b681 (patch)
treeb10970af30d92721508b3f434495076c936b0913
parent777447ccdbabfaf2448e0dc812f0d755c889600e (diff)
parente24ed0b53e61949ad697ba4374c74bc5e0d2ad19 (diff)
Merge "[ONAP] Upgrade crunchy image"
-rw-r--r--kubernetes/common/postgres/templates/_deployment.tpl4
-rw-r--r--kubernetes/common/repositoryGenerator/values.yaml2
-rwxr-xr-xkubernetes/onap/values.yaml2
3 files changed, 6 insertions, 2 deletions
diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index 38a7ce1f63..7d04501f24 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -58,6 +58,8 @@ spec:
env:
- name: PG_PRIMARY_USER
value: primaryuser
+ - name: MODE
+ value: postgres
- name: PG_PRIMARY_PASSWORD_INPUT
{{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
- name: PG_USER
@@ -117,6 +119,8 @@ spec:
value: /tmp
- name: PG_PRIMARY_USER
value: primaryuser
+ - name: MODE
+ value: postgres
- name: PG_MODE
value: {{ $pgMode }}
- name: PG_PRIMARY_HOST
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index 559675689f..386ba9b490 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -32,7 +32,7 @@ global:
loggingImage: beats/filebeat:5.5.0
mariadbImage: bitnami/mariadb:10.5.8
nginxImage: bitnami/nginx:1.18-debian-10
- postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+ postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
readinessImage: onap/oom/readiness:3.0.1
# Default credentials
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 30155dc3c5..6ff7d13c6c 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -103,7 +103,7 @@ global:
nginxImage: bitnami/nginx:1.18-debian-10
# postgreSQL client and server image
- postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+ postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
# readiness check image
readinessImage: onap/oom/readiness:3.0.1