Merge pull request #2354 from GiganticMinecraft/upgrade_mariadb

upgrade mariadb
GiganticMinecraft · Dec 29, 2024 · d69ba88 · d69ba88
2 parents c977257 + 4b0a79c
commit d69ba88
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/...anifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/mariadb-operator.yaml b/...anifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/mariadb-operator.yaml
@@ -1,5 +1,29 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
+metadata:
+  name: mariadb-operator-crds
+  namespace: argocd
+spec:
+  project: cluster-wide-apps
+  source:
+    chart: mariadb-operator-crds
+    repoURL: https://mariadb-operator.github.io/mariadb-operator
+    targetRevision: 0.36.0
+    helm:
+      releaseName: mariadb-operator-crds
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: mariadb-operator
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
 metadata:
   name: mariadb-operator
   namespace: argocd
@@ -8,17 +32,23 @@ spec:
   source:
     chart: mariadb-operator
     repoURL: https://mariadb-operator.github.io/mariadb-operator
-    targetRevision: 0.31.0
+    targetRevision: 0.36.0
     helm:
       releaseName: mariadb-operator
       values: |
+        image:
+          repository: ghcr.io/mariadb-operator/mariadb-operator
+          pullPolicy: IfNotPresent
         ha:
           enabled: true
-          replicas: 3
         metrics:
           enabled: true
           additionalLabels:
             release: prometheus
+        webhook:
+          cert:
+            certManager:
+              enabled: true
   destination:
     server: https://kubernetes.default.svc
     namespace: mariadb-operator

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/mariadb/mariadb.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/mariadb/mariadb.yaml
@@ -16,7 +16,7 @@ spec:
     generate: false
     key: mcserver-password
 
-  image: mariadb:10.11.10
+  image: docker-registry1.mariadb.com/library/mariadb:10.11.10
   imagePullPolicy: IfNotPresent
 
   port: 3306

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/mariadb/mariadb.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/mariadb/mariadb.yaml
@@ -16,7 +16,7 @@ spec:
     generate: false
     key: mcserver-password
 
-  image: mariadb:10.11.10
+  image: docker-registry1.mariadb.com/library/mariadb:10.11.10
   imagePullPolicy: IfNotPresent
 
   port: 3306
@@ -29,13 +29,17 @@ spec:
 
   myCnf: |
     [mariadb]
+    slow_query_log=true
+    slow_query_log-file=/var/log/mysql/mysql-slow.log
+    long_query_time=0.1
     innodb_buffer_pool_size = 1G
     innodb_log_file_size = 256M
     innodb_flush_log_at_trx_commit = 2
     innodb_write_io_threads = 8
     innodb_io_capacity = 1000
     innodb_io_capacity_max = 3000
     max_allowed_packet = 256M
+    performance_schema=on
 
   # resources:
   #   requests: