Merge "[MARIADB] Update mariadb-operator and templates to 0.27.0"

[oom.git] / kubernetes / common / mariadb-galera / values.yaml

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 991c635..3d9725c 100644 (file)
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -56,16 +56,16 @@ secrets:
 
 mariadbOperator:
   image: mariadb
-  appVersion: 11.1.2
+  appVersion: 11.2.2
   persistence:
     #storageClassName: default
     size: 3Gi
   galera:
     enabled: true
-    agentImage: mariadb-operator/agent
-    agentVersion: v0.0.3
-    initImage: mariadb-operator/init
-    initVersion: v0.0.6
+    agentImage: mariadb-operator/mariadb-operator
+    agentVersion: v0.0.27
+    initImage: mariadb-operator/mariadb-operator
+    initVersion: v0.0.27
 
 ## String to partially override common.names.fullname template (will maintain the release name)
 ##
@@ -99,7 +99,7 @@ podAnnotations:
   #  sidecar.istio.io/inject: "false"
   traffic.sidecar.istio.io/excludeInboundPorts: "4444,4567,4568"
   traffic.sidecar.istio.io/includeInboundPorts: '*'
-  traffic.sidecar.istio.io/excludeOutboundPorts: "4444,4567,4568"
+  traffic.sidecar.istio.io/excludeOutboundPorts: "4444,4567,4568,443"
 
 mariadbOpConfiguration: |-
   [mysqld]
@@ -267,8 +267,16 @@ galera:
 ## For this reason the db data pvc needs to have accessMode: ReadWriteMany.
 backup:
   enabled: false
+  # used in the mariadb-operator to override the backup name (default is DBName)
+  # nameOverride:
+  # defines the backup job execution period
   cron: "00 00 * * *"
+  # used by mariadb-operator to set the max retention time
+  maxRetention: 720h
   retentionPeriod: 3
+  # used by mariadb-operator to set the backup storage type (PVC, S3, volume)
+  storageType: PVC
+  # configuration used for PVC backup storage
   persistence:
     ## If true, use a Persistent Volume Claim, If false, use emptyDir
     ##
@@ -297,12 +305,32 @@ backup:
     ## Persistent Volume size
     ##
     size: 2Gi
-
+  # requires mariadb-operator v0.24.0
+  # configuration used for S3 backup storage
+  # see: https://github.com/mariadb-operator/mariadb-operator/blob/main/docs/BACKUP.md
+  s3:
+    bucket: backups
+    endpoint: minio.minio.svc.cluster.local:9000
+    #region:  us-east-1
+    accessKeyIdSecretKeyRef:
+      name: minio
+      key: access-key-id
+    secretAccessKeySecretKeyRef:
+      name: minio
+      key: secret-access-key
+    tls:
+      enabled: false
+      caSecretKeyRef:
+        name: minio-ca
+        key: ca.crt
+  # configuration used for kubernetes volumes as backup storage
+  # see: https://github.com/mariadb-operator/mariadb-operator/blob/main/docs/BACKUP.md
+  volume: {}
 
 readinessCheck:
   wait_for:
-    apps:
-      - '{{ include "common.name" . }}'
+    services:
+      - '{{ include "common.servicename" . }}'
 
 ## TLS configuration
 ##
@@ -564,18 +592,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: '1'
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 500m
-      memory: 2Gi
+      cpu: "500m"
+      memory: "2Gi"
   large:
     limits:
-      cpu: '2'
-      memory: 6Gi
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      cpu: '1'
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 ## MariaDB Galera containers' liveness and readiness probes
@@ -640,11 +668,11 @@ metrics:
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "200Mi"
     requests:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "200Mi"
   ## MariaDB Galera metrics container's liveness and readiness probes
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
   ##