From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 5 Jan 2022 15:08:27 +0000 (+0100)
Subject: [MARIADB] Downgrade mariadb version
X-Git-Tag: 10.0.0~157
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=0d2cf1aee02c84d5ff262b4ac1d414fdadf5432b;p=oom.git

[MARIADB] Downgrade mariadb version

Use version 10.6.5-debian-10-r28 instead of 10.6.5.
Also align clamp and so to use the same version as the other ones

Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ie1db09b03daa1bb7792ee0ff6a73bd3483213e75
---

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 769c9b7946..f49a898818 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -50,7 +50,7 @@ global:
   clusterDomain: cluster.local
   metrics: {}
 
-image: bitnami/mariadb-galera:10.6.5
+image: bitnami/mariadb-galera:10.6.5-debian-10-r28
 ## Specify a imagePullPolicy
 ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index e36ad4904c..a05bc13ae6 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -32,7 +32,7 @@ global:
   jreImage: onap/integration-java11:10.0.0
   kubectlImage: bitnami/kubectl:1.19
   loggingImage: beats/filebeat:5.5.0
-  mariadbImage: bitnami/mariadb:10.6.5
+  mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
   nginxImage: bitnami/nginx:1.18-debian-10
   postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
   readinessImage: onap/oom/readiness:3.0.1
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 1b6099a0cd..3ae58a3390 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -97,7 +97,7 @@ global:
   loggingImage: beats/filebeat:5.5.0
 
   # mariadb client image
-  mariadbImage: bitnami/mariadb:10.6.5
+  mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
 
   # nginx server image
   nginxImage: bitnami/nginx:1.18-debian-10
diff --git a/kubernetes/policy/components/policy-clamp-be/templates/job.yaml b/kubernetes/policy/components/policy-clamp-be/templates/job.yaml
index 8fe711b825..b942dd3fb2 100755
--- a/kubernetes/policy/components/policy-clamp-be/templates/job.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/templates/job.yaml
@@ -49,7 +49,7 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: {{ include "common.release" . }}-policy-clamp-galera-config
-        image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.db.image }}
+        image: {{ include "repositoryGenerator.image.mariadb" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /dbcmd-config/create-db-tables.sh
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 178dff0261..2a84fac247 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -39,7 +39,7 @@ spec:
     spec:
       containers:
       - name: {{ include "common.fullname" . }}
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+        image: {{ include "repositoryGenerator.image.mariadb" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST