Merge pull request #60 from eftechcombr/latest

Sync from latest
eftechcombr · Apr 23, 2024 · 82224af · 82224af
2 parents bd8467a + 4d1d0aa
commit 82224af
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/kubernetes/glpi-deployment.yaml b/kubernetes/glpi-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     app: php-fpm
   namespace: glpi
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: php-fpm
@@ -57,7 +57,7 @@ metadata:
     app: nginx
   namespace: glpi 
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: nginx

diff --git a/kubernetes/glpi-persistentvolumeclaim.yaml b/kubernetes/glpi-persistentvolumeclaim.yaml
@@ -5,9 +5,10 @@ metadata:
   name: glpi-files
   namespace: glpi
 spec:
-  storageClassName: longhorn
+  # storageClassName: longhorn
   accessModes:
-    - ReadWriteMany
+    # - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 10Gi
@@ -19,9 +20,10 @@ metadata:
   name: glpi-marketplace
   namespace: glpi
 spec:
-  storageClassName: longhorn
+  # storageClassName: longhorn
   accessModes:
-    - ReadWriteMany
+#    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 2Gi
@@ -35,9 +37,10 @@ metadata:
   name: glpi-etc
   namespace: glpi
 spec:
-  storageClassName: longhorn
+  # storageClassName: longhorn
   accessModes:
-    - ReadWriteMany
+#    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 50Mi

diff --git a/kubernetes/mariadb-configmap.yaml b/kubernetes/mariadb-configmap.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata: 
+  name: mariadb-glpi-config
+  namespace: glpi 
+data: 
+  MARIADB_HOST: "mariadb-headless.glpi.svc.cluster.local"
+  MARIADB_PORT: "3306"
diff --git a/kubernetes/mariadb-job.yaml b/kubernetes/mariadb-job.yaml
@@ -11,12 +11,15 @@ spec:
         imagePullPolicy: IfNotPresent
         name: base
         command:
-        - sh 
-        - -c
-        - "mysql -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e \"GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES; FLUSH PRIVILEGES;\""
+        - sh
+        - -c 
+        - "mysql --host=${MARIADB_HOST} -u root -p${MARIADB_ROOT_PASSWORD} -e \"GRANT SELECT ON mysql.time_zone_name TO 'glpi'@'%'; FLUSH PRIVILEGES;\""
         envFrom: 
         - secretRef: 
             name: mariadb-glpi-secret
+        - configMapRef: 
+            name: mariadb-glpi-config
+
       restartPolicy: Never
   backoffLimit: 5
 status: {}

diff --git a/kubernetes/mariadb-persistentvolumeclaim.yaml b/kubernetes/mariadb-persistentvolumeclaim.yaml
@@ -6,7 +6,7 @@ metadata:
   name: mariadb-data
   namespace: glpi 
 spec:
-  storageClassName: longhorn
+  # storageClassName: longhorn
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/kubernetes/mariadb-secret.yaml b/kubernetes/mariadb-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   name: mariadb-glpi-secret
   namespace: glpi 
 data: 
-  MARIADB_ROOT_PASSWORD: bXktc2VjcmV0LXB3Cg==
+  MARIADB_ROOT_PASSWORD: Z2xwaQ==
   MARIADB_DATABASE: Z2xwaQ==
   MARIADB_USER: Z2xwaQ==
   MARIADB_PASSWORD: Z2xwaQ==

diff --git a/kubernetes/namespace.yaml b/kubernetes/namespace.yaml
@@ -1,7 +1,5 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  creationTimestamp: null
   name: glpi
-spec: {}
-status: {}
+