mariadb clean setup

.idea/dataSources.xml

@@ -2,18 +2,13 @@
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
     <data-source source="LOCAL" name="sql.xai-corp.net" uuid="50d1cd4d-852c-4d57-bd9b-ccf70b0f652a">
-      <driver-ref>mysql.8</driver-ref>
+      <driver-ref>mariadb</driver-ref>
       <synchronize>true</synchronize>
       <remarks>nextcloud</remarks>
-      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://sql.xai-corp.net:3306/nextcloud2</jdbc-url>
+      <jdbc-url>jdbc:mariadb://sql.xai-corp.net:3306/nextcloud2</jdbc-url>
       <driver-properties>
         <property name="autoReconnect" value="true" />
-        <property name="zeroDateTimeBehavior" value="CONVERT_TO_NULL" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
       </driver-properties>
     </data-source>
     <data-source source="LOCAL" name="xaicorp_default@sql.xai-corp.net" uuid="24a224c6-845c-41ce-9c9d-fa5d54f7b87e">
@@ -23,5 +18,42 @@
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
       <jdbc-url>jdbc:postgresql://sql.xai-corp.net:5432/xaicorp_default</jdbc-url>
     </data-source>
+    <data-source source="LOCAL" name="xaicorp_default@sql.xai-corp.net local" uuid="2dd6b8bb-81be-4efe-85d5-3e791d168891">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>production postgres database</remarks>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5432/xaicorp_default</jdbc-url>
+    </data-source>
+    <data-source source="LOCAL" name="sql.xai-corp.net local" uuid="b398ddb0-97ff-48d5-9ed0-8001beaf3957">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>nextcloud</remarks>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3306/nextcloud2</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+      </driver-properties>
+    </data-source>
+    <data-source source="LOCAL" name="sql.xai-corp.net local [root]" uuid="389f3c5e-cdad-4cff-b51e-8ae7a354efbc">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>nextcloud</remarks>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3306/</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+      </driver-properties>
+    </data-source>
+    <data-source source="LOCAL" name="mariadb: sql.xai-corp.net [root]" uuid="5962de05-d06a-473e-9b19-c373fe78f3fa">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>root connection to mariadb</remarks>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3307/</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+      </driver-properties>
+    </data-source>
   </component>
 </project>

ansible-5/roles/prod.k3s/defaults/main.yml

@@ -18,7 +18,7 @@ fstab:
 #      path: "/opt/shared"
 #      state: mounted
     - name: mariadb
-      path: "/opt/mariadb"
+      path: "/opt/data/db"
       state: mounted
 
 helm:
@@ -38,11 +38,19 @@ apps:
   stash:
     state: present
     namespace: stashapp
+
   mariadb:
-    enabled: false
-    namespace: mariadb
-  gitea:
     enabled: true
+    namespace: mariadb
+    pvc: data-mariadb-0
+    state: present
+    secrets:
+      password: faj48290q2u58vy8qphqtqj
+      root_password: q4890qhhfgq9pfg3q4uyg33
+      replication_password: 4q389hq7gf8qo47gq8374g
+
+  gitea:
+    enabled: false
     namespace: gitea
     state: present
 

ansible-5/roles/prod.k3s/files/mariadb/values.yaml

@@ -1,17 +1,37 @@
 ---
-# mariadb values file
+# Bitnami chart
-
+# https://github.com/bitnami/charts/blob/main/bitnami/mariadb/values.yaml
-secondary:
-  replicaCount: 0
 
+architecture: standalone
 image:
-#  repository: mariadb
+  registry: docker.io
-#  tag: 10.5
+  repository: bitnami/mariadb
+  tag: 10.9
+  digest: ""
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
 
+## MariaDB Authentication parameters
+##
 auth:
-  rootPassword: "aifuoqibcqobcqb3"
+  ## @param auth.rootPassword Password for the `root` user. Ignored if existing secret is provided.
-#  existingSecret: ''
+  ## ref: https://github.com/bitnami/containers/tree/main/bitnami/mariadb#setting-the-root-password-on-first-run
-
+  ##
-#primary:
+#  rootPassword: ""
-#  persistence:
+  ## @param auth.database Name for a custom database to create
-#    existingClaim: mariadb-pv-claim
+  ## ref: https://github.com/bitnami/containers/blob/main/bitnami/mariadb/README.md#creating-a-database-on-first-run
+  ##
+  database: test
+  ## @param auth.username Name for a custom user to create
+  ## ref: https://github.com/bitnami/containers/blob/main/bitnami/mariadb/README.md#creating-a-database-user-on-first-run
+  ##
+  username: "test"
+  ## @param auth.password Password for the new user. Ignored if existing secret is provided
+  ##
+#  password: ""
+  ## @param auth.existingSecret Use existing secret for password details (`auth.rootPassword`, `auth.password`, `auth.replicationPassword` will be ignored and picked up from this secret). The secret has to contain the keys `mariadb-root-password`, `mariadb-replication-password` and `mariadb-password`
+  ##
+  existingSecret: "mariadb-secrets"

ansible-5/roles/prod.k3s/tasks/deployments/mariadb.yaml

@@ -2,29 +2,43 @@
 #https://github.com/bitnami/charts/tree/master/bitnami/mariadb
 
 
-- name: "todo: deploy mariadb"
-  debug:
-    msg: "TODO: write deployment tasks"
 
 - name: Create a namespace for mariadb
   k8s:
     kubeconfig: "/etc/rancher/k3s/k3s.yaml"
-    name: mariadb
+    name: "{{apps.mariadb.namespace}}"
     api_version: v1
     kind: Namespace
-    state: present
+    state: "{{apps.mariadb.state}}"
   become: true
 
 - name: create persistent volume resources
   kubernetes.core.k8s:
     kubeconfig: "/etc/rancher/k3s/k3s.yaml"
-    state: present
+    state: "{{apps.mariadb.state}}"
     definition: "{{ lookup('template', item) | from_yaml }}"
   loop:
     - mariadb/pv.yaml
     - mariadb/pv-claim.yaml
   become: true
 
+- name: create secret for mariadb
+  kubernetes.core.k8s:
+    kubeconfig: "/etc/rancher/k3s/k3s.yaml"
+    state: "{{apps.mariadb.state}}"
+    definition:
+      apiVersion: v1
+      kind: Secret
+      type: Opaque
+      metadata:
+        name: mariadb-secrets
+        namespace: "{{apps.mariadb.namespace}}"
+      stringData:
+        mariadb-password: "{{apps.mariadb.secrets.password}}"
+        mariadb-root-password: "{{apps.mariadb.secrets.root_password}}"
+        mariadb-replication-password: "{{apps.mariadb.secrets.replication_password}}"
+  become: true
+
 - name: Install mariadb globally available
   block:
     - name: Add mariadb chart helm repo
@@ -41,9 +55,9 @@
     - name: Install mariadb Release
       local_action:
         module: kubernetes.core.helm
-        release_state: present
+        release_state: "{{apps.mariadb.state}}"
-        name: "{{apps.mariadb.namespace}}"
+        name: mariadb
-        namespace: mariadb
+        namespace: "{{apps.mariadb.namespace}}"
         create_namespace: yes
         update_repo_cache: True
         chart_ref: bitnami/mariadb

ansible-5/roles/prod.k3s/tasks/main.yml

@@ -16,8 +16,9 @@
 - name: deploy stash
   include_tasks: deployments/stash.yaml
 
-#- name: deploy mariadb
+- name: deploy mariadb
-#  include_tasks: deployments/mariadb.yaml
+  include_tasks: deployments/mariadb.yaml
+  when: apps.mariadb.enabled
 
 - name: deploy gitea
   include_tasks: deployments/gitea.yaml

ansible-5/roles/prod.k3s/templates/mariadb/pv-claim.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: "{{apps.mariadb.namespace}}"
+  name: "{{apps.mariadb.pvc}}"
-  namespace: mariadb
+  namespace: "{{apps.mariadb.namespace}}"
 spec:
   storageClassName: manual
   accessModes:

ansible-5/roles/prod.k3s/templates/mariadb/pv.yaml

@@ -13,5 +13,5 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/opt/mariadb"
+    path: "/opt/data/db/mariadb-10.9"
 

dockerfiles/services/services/mariadb/docker-compose.yml

@@ -9,7 +9,8 @@ services:
   mysql:
     image: "mariadb:10.5"
     volumes:
-      - /opt/mariadb/data:/var/lib/mysql
+      - /opt/data/mariadb/data:/var/lib/mysql
+#      - /opt/mariadb/data:/var/lib/mysql
     ports:
       - "3306:3306"
     environment:
@@ -38,5 +39,5 @@ services:
         fluentd-async-connect: 'true'
         tag: mariadb
 
-    networks:
+#    networks:
-      - prod_db
+#      - prod_db