Merge "[MARIADB] Update image versions to the latest MariaDB Operator"

14 files changed, 66 insertions, 27 deletions

diff --git a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
index 535ee10d64..c06871bd7e 100644
--- a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
@@ -50,9 +50,9 @@ The versions of software that are supported and tested by OOM are as follows:
   ==============     ===========  =======  ========  ========  =============  ========
   Release            Kubernetes   Helm     kubectl   Docker    Cert-Manager   Strimzi
   ==============     ===========  =======  ========  ========  =============  ========
-  Montreal           1.27.5       3.12.3   1.27.x    20.10.x   1.13.2         0.36.1
   New Delhi          1.28.6       3.13.1   1.28.x    20.10.x   1.14.4         0.41.0
   Oslo               1.28.6       3.13.1   1.30.x    23.0.x    1.16.2         0.44.0
+  Paris              1.28.6       3.13.1   1.30.x    23.0.x    1.16.2         0.44.0
   ==============     ===========  =======  ========  ========  =============  ========
 
 .. table:: OOM Software Requirements (production)
@@ -60,9 +60,9 @@ The versions of software that are supported and tested by OOM are as follows:
   ==============     ======  ============ ==============
   Release            Istio   Gateway-API  Keycloak
   ==============     ======  ============ ==============
-  Montreal           1.19.3  v1.0.0       19.0.3-legacy
   New Delhi          1.21.0  v1.0.0       22.0.4
   Oslo               1.24.1  v1.2.1       26.0.6
+  Paris              1.24.1  v1.2.1       26.0.6
   ==============     ======  ============ ==============
 
 .. table:: OOM Software Requirements (optional)
@@ -70,7 +70,7 @@ The versions of software that are supported and tested by OOM are as follows:
   ==============     =========== ========== =========== ============ ===========
   Release            Prometheus  K8ssandra  MariaDB-Op  Postgres-Op  MongoDB-Op
   ==============     =========== ========== =========== ============ ===========
-  Montreal           45.x        1.10.2     0.23.1      -            -
   New Delhi          45.x        1.16.0     0.28.1      -            -
   Oslo               45.x        1.20.2     0.36.0      5.7.2        1.18.0
+  Paris              45.x        1.20.2     0.37.1      5.7.2        1.18.0
   ==============     =========== ========== =========== ============ ===========
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 118cd22d97..fb022723b2 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v2
 description: Common templates for inclusion in other charts
 name: common
-version: 13.2.15
+version: 13.2.16
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 44ab996eb1..f2a4a0c09e 100644
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -254,6 +254,7 @@ kind: MariaDB
 metadata:
   name: {{ $dbinst }}
 spec:
+  resources: {{ include "common.resources" . | nindent 4 }}
   podSecurityContext:
     runAsUser: 10001
     runAsGroup: 10001
@@ -305,7 +306,7 @@ spec:
     sst: mariabackup
     replicaThreads: 1
     agent:
-      image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }}:{{ $dot.Values.mariadbOperator.galera.agentVersion }}
+      image: {{ include "repositoryGenerator.mariadbContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }}:{{ $dot.Values.mariadbOperator.galera.agentVersion }}
       imagePullPolicy: IfNotPresent
       port: 5555
       kubernetesAuth:
@@ -322,6 +323,13 @@ spec:
         privileged: false
         runAsNonRoot: true
         runAsUser: 10001
+      resources:
+        limits:
+          cpu: 100m
+          memory: 128Mi
+        requests:
+          cpu: 100m
+          memory: 128Mi
     primary:
       automaticFailover: true
     recovery:
@@ -332,7 +340,7 @@ spec:
       podRecoveryTimeout: 3m0s
       podSyncTimeout: 3m0s
     initContainer:
-      image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
+      image: {{ include "repositoryGenerator.mariadbContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
       imagePullPolicy: IfNotPresent
       securityContext:
         allowPrivilegeEscalation: false
@@ -343,6 +351,13 @@ spec:
         privileged: false
         runAsNonRoot: true
         runAsUser: 10001
+      resources:
+        limits:
+          cpu: 100m
+          memory: 128Mi
+        requests:
+          cpu: 100m
+          memory: 128Mi
     config:
       reuseStorageVolume: false
       volumeClaimTemplate:
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 552f6cc67d..c5cfdd7e63 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: Chart for MariaDB Galera cluster
 name: mariadb-galera
-version: 13.2.3
+version: 13.2.4
 keywords:
   - mariadb
   - mysql
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 6684d6dcb3..e1d650f881 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -20,6 +20,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  mariadbContainerRegistry: docker-registry3.mariadb.com
   persistence:
     mountPath: /dockerdata-nfs
     backup:
@@ -56,16 +57,16 @@ secrets:
 
 mariadbOperator:
   image: mariadb
-  appVersion: 11.2.2
+  appVersion: 11.4.4
   persistence:
     #storageClassName: default
     size: 3Gi
   galera:
     enabled: true
     agentImage: mariadb-operator/mariadb-operator
-    agentVersion: v0.0.28
+    agentVersion: 0.37.1
     initImage: mariadb-operator/mariadb-operator
-    initVersion: v0.0.28
+    initVersion: 0.37.1
 
 ## String to partially override common.names.fullname template (will maintain the release name)
 ##
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index 09d6836574..949a444591 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v2
 description: Template used to generate the right repository link
 name: repositoryGenerator
-version: 13.0.0
+version: 13.0.1
diff --git a/kubernetes/common/repositoryGenerator/templates/_repository.tpl b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
index e708926049..14b8cc7783 100644
--- a/kubernetes/common/repositoryGenerator/templates/_repository.tpl
+++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
@@ -88,6 +88,16 @@
   {{- include "repositoryGenerator._repositoryHelper" (merge (dict "repoName" "githubContainerRegistry") .) }}
 {{- end -}}
 
+{{/*
+  Resolve the name of the mariadbRepository image repository.
+
+  - .Values.global.mariadbContainerRegistry  : default image mariadbContainerRegistry for all images used by mariadb.operator
+  - .Values.mariadbContainerRegistryOverride : override global mariadbContainerRegistry repository on a per chart basis
+*/}}
+{{- define "repositoryGenerator.mariadbContainerRegistry" -}}
+  {{- include "repositoryGenerator._repositoryHelper" (merge (dict "repoName" "mariadbContainerRegistry") .) }}
+{{- end -}}
+
 {{- define "repositoryGenerator.image._helper" -}}
   {{- $dot := default . .dot -}}
   {{- $initRoot := default $dot.Values.repositoryGenerator .initRoot -}}
@@ -234,5 +244,17 @@
   {{-     $repoCreds = printf "%s, %s" $repoCreds $ghcrRepoCreds }}
   {{-   end }}
   {{- end }}
+  {{- if $subchartDot.Values.global.mariadbContainerRegistryCred }}
+  {{-   $mariadbRepo := $subchartDot.Values.global.mariadbContainerRegistry }}
+  {{-   $mariadbCred := $subchartDot.Values.global.mariadbContainerRegistryCred }}
+  {{-   $mariadbMail := default "@" $mariadbCred.mail }}
+  {{-   $mariadbAuth := printf "%s:%s" $mariadbCred.user $mariadbCred.password | b64enc }}
+  {{-   $mariadbRepoCreds := printf "\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}" $mariadbRepo $mariadbCred.user $mariadbCred.password $mariadbMail $mariadbAuth }}
+  {{-   if eq "" $repoCreds }}
+  {{-     $repoCreds = $mariadbRepoCreds }}
+  {{-   else }}
+  {{-     $repoCreds = printf "%s, %s" $repoCreds $mariadbRepoCreds }}
+  {{-   end }}
+  {{- end }}
   {{- printf "{%s}" $repoCreds | b64enc -}}
 {{- end -}}
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index 73d6d044d5..8f97431599 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -21,6 +21,7 @@ global:
   elasticRepository: docker.elastic.co
   googleK8sRepository: k8s.gcr.io
   githubContainerRegistry: ghcr.io
+  mariadbContainerRegistry: docker-registry3.mariadb.com
   quayRepository: quay.io
 
   # common global images
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index ec6cbc5265..78ecf27149 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -37,6 +37,7 @@ global:
   quayRepository: quay.io
   googleK8sRepository: k8s.gcr.io
   githubContainerRegistry: ghcr.io
+  mariadbContainerRegistry: docker-registry3.mariadb.com
 
   # Default credentials
   # they're optional. If the target repository doesn't need them, comment them
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index cf2b2bcdf8..5befddc462 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -132,10 +132,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "1Gi"
+      memory: "1.5Gi"
     requests:
       cpu: "0.5"
-      memory: "1Gi"
+      memory: "1.5Gi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index dc6f2b74d6..ad5548733e 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -128,10 +128,10 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "1Gi"
+      memory: "3Gi"
     requests:
       cpu: "0.5"
-      memory: "1Gi"
+      memory: "2Gi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index 2b219d0595..cfeb071b68 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -105,17 +105,17 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "1Gi"
+      memory: "3Gi"
     requests:
       cpu: "0.5"
-      memory: "1Gi"
+      memory: "2Gi"
   large:
     limits:
       cpu: "2"
-      memory: "2Gi"
+      memory: "4Gi"
     requests:
       cpu: "1"
-      memory: "2Gi"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 93660280cb..c075c6922a 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -80,10 +80,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
-  annotations:
-    "helm.sh/hook": post-upgrade,post-rollback,post-install
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": before-hook-creation
+  {{- if .Values.jobAnnotations }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index d45ee69401..09d652e4eb 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -132,17 +132,17 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "1Gi"
+      memory: "2Gi"
     requests:
       cpu: "0.5"
-      memory: "1Gi"
+      memory: "2Gi"
   large:
     limits:
       cpu: "2"
-      memory: "2Gi"
+      memory: "3Gi"
     requests:
       cpu: "1"
-      memory: "2Gi"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health