X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_mariadb.tpl;fp=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_mariadb.tpl;h=41259b3b4f359f0b74fc3711b042d74f53eba703;hp=caf2fd1031a689779aa6eab489abeecbd1da524e;hb=62c5d115a4c8b82e8cb93fedcfd973e76223fb9c;hpb=f1a3f7f6d93d070d1f733af8eb116e3ea8f76704

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index caf2fd1031..41259b3b4f 100644
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -118,14 +118,14 @@
 {{- end -}}
 
 {{/*
-  Create MariDB Database via mariadb-operator
+  Create MariaDB Database via mariadb-operator
 */}}
 {{- define "common.mariadbOpDatabase" -}}
 {{- $dot := default . .dot -}}
 {{- $dbname := (required "'dbame' param, is required." .dbname) -}}
 {{- $dbinst := (required "'dbinst' param, is required." .dbinst) -}}
 ---
-apiVersion: mariadb.mmontes.io/v1alpha1
+apiVersion: k8s.mariadb.com/v1alpha1
 kind: Database
 metadata:
   name: {{ $dbinst }}-{{ $dbname }}
@@ -147,7 +147,7 @@ spec:
 {{- $dbinst := (required "'dbinst' param, is required." .dbinst) -}}
 {{- $dbsecret := (required "'dbsecret' param, is required." .dbsecret) -}}
 ---
-apiVersion: mariadb.mmontes.io/v1alpha1
+apiVersion: k8s.mariadb.com/v1alpha1
 kind: User
 metadata:
   name: {{ $dbinst }}-{{ $dbuser }}
@@ -155,6 +155,7 @@ spec:
   name: {{ $dbuser }}
   mariaDbRef:
     name: {{ $dbinst }}
+    waitForIt: true
   passwordSecretKeyRef:
     name: {{ $dbsecret }}
     key: password
@@ -172,13 +173,14 @@ spec:
 {{- $dbname := (required "'dbame' param, is required." .dbname) -}}
 {{- $dbinst := (required "'dbinst' param, is required." .dbinst) -}}
 ---
-apiVersion: mariadb.mmontes.io/v1alpha1
+apiVersion: k8s.mariadb.com/v1alpha1
 kind: Grant
 metadata:
   name: {{ $dbuser }}-{{ $dbname }}-{{ $dbinst }}
 spec:
   mariaDbRef:
     name: {{ $dbinst }}
+    waitForIt: true
   privileges:
     - "ALL"
   database: {{ $dbname }}
@@ -196,13 +198,19 @@ spec:
 {{- $dbinst := include "common.name" $dot -}}
 {{- $name := default $dbinst $dot.Values.backup.nameOverride -}}
 ---
-apiVersion: mariadb.mmontes.io/v1alpha1
+apiVersion: k8s.mariadb.com/v1alpha1
 kind: Backup
 metadata:
   name: {{ $name }}
 spec:
+  inheritMetadata:
+    labels:
+      sidecar.istio.io/inject: 'false'
+  backoffLimit: 5
+  logLevel: info
   mariaDbRef:
     name: {{ $dbinst }}
+    waitForIt: true
   schedule:
     cron: {{ $dot.Values.backup.cron }}
     suspend: false
@@ -244,7 +252,7 @@ spec:
 {{- $dbrootsecret := tpl (default (include "common.mariadb.secret.rootPassSecretName" (dict "dot" $dot "chartName" "")) $dot.Values.rootUser.externalSecret) $dot -}}
 {{- $dbusersecret := tpl (default (include "common.mariadb.secret.userCredentialsSecretName" (dict "dot" $dot "chartName" "")) $dot.Values.db.externalSecret) $dot -}}
 ---
-apiVersion: mariadb.mmontes.io/v1alpha1
+apiVersion: k8s.mariadb.com/v1alpha1
 kind: MariaDB
 metadata:
   name: {{ $dbinst }}
@@ -258,6 +266,9 @@ spec:
     annotations: {{ toYaml .Values.podAnnotations | nindent 6 }}
     {{- end }}
     labels:
+      # temporarily test mariaDB without sidecar (fix initial Job, Backup and Metrics)
+      # will be obsolete with "native-sidecars" feature in K8S and Istio
+      sidecar.istio.io/inject: "false"
       app: {{ $dbinst }}
       version: {{ .Values.mariadbOperator.appVersion }}
   rootPasswordSecretKeyRef:
@@ -281,24 +292,30 @@ spec:
         enabled: true
         authDelegatorRoleName: {{ $dbinst }}-auth
       gracefulShutdownTimeout: 5s
+    primary:
+      automaticFailover: true
+      podIndex: 0
     recovery:
       enabled: true
-      clusterHealthyTimeout: 5m0s
+      clusterHealthyTimeout: 30s
       clusterBootstrapTimeout: 10m0s
-      podRecoveryTimeout: 5m0s
-      podSyncTimeout: 10m0s
+      minClusterSize: 50%
+      podRecoveryTimeout: 3m0s
+      podSyncTimeout: 3m0s
     initContainer:
       image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
       imagePullPolicy: IfNotPresent
-    volumeClaimTemplate:
-      {{- if .Values.mariadbOperator.storageClassName }}
-      storageClassName: {{ .Values.mariadbOperator.storageClassName }}
-      {{- end }}
-      resources:
-        requests:
-          storage: 50Mi
-      accessModes:
-        - ReadWriteOnce
+    config:
+      reuseStorageVolume: false
+      volumeClaimTemplate:
+        {{- if .Values.mariadbOperator.persistence.storageClassName }}
+        storageClassName: {{ .Values.mariadbOperator.persistence.storageClassName }}
+        {{- end }}
+        resources:
+          requests:
+            storage: 50Mi
+        accessModes:
+          - ReadWriteOnce
   {{- end }}
   livenessProbe:
     exec:
@@ -318,7 +335,7 @@ spec:
     initialDelaySeconds: 20
     periodSeconds: 10
     timeoutSeconds: 5
-  {{- if default false .Values.global.metrics.enabled }}
+  {{- if default false $dot.Values.global.metrics.enabled }}
   metrics:
     enabled: true
   {{- end }}
@@ -327,7 +344,7 @@ spec:
       requiredDuringSchedulingIgnoredDuringExecution:
         - topologyKey: kubernetes.io/hostname
   tolerations:
-    - key: mariadb.mmontes.io/ha
+    - key: k8s.mariadb.com/ha
       operator: Exists
       effect: NoSchedule
   podDisruptionBudget:
@@ -339,15 +356,11 @@ spec:
     key: my.cnf
     name: {{ printf "%s-configuration" (include "common.fullname" $dot) }}
   resources: {{ include "common.resources" . | nindent 4 }}
-  volumeClaimTemplate:
-    {{- if $dot.Values.mariadbOperator.storageClassName }}
-    storageClassName: {{ $dot.Values.mariadbOperator.storageClassName }}
+  storage:
+    {{- if $dot.Values.mariadbOperator.persistence.storageClassName }}
+    storageClassName: {{ $dot.Values.mariadbOperator.persistence.storageClassName }}
     {{- end }}
-    resources:
-      requests:
-        storage: {{ $dot.Values.mariadbOperator.persistence.size | quote }}
-    accessModes:
-      - ReadWriteOnce
+    size: {{ $dot.Values.mariadbOperator.persistence.size | quote }}
 {{-  if $dot.Values.db.user }}
 {{ include "common.mariadbOpUser" (dict "dot" . "dbuser" $dot.Values.db.user "dbinst" $dbinst "dbsecret" $dbusersecret) }}
 {{-  end }}