Merge branch 'dev' into patch-16

misc/integrations/k8s.mysql.ui.yml

@@ -124,7 +124,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -151,7 +151,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -213,64 +213,6 @@ spec:
 ---
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: bunkerweb-redis
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: bunkerweb-redis
-  template:
-    metadata:
-      labels:
-        app: bunkerweb-redis
-    spec:
-      containers:
-        - name: bunkerweb-redis
-          image: redis:7-alpine
-          imagePullPolicy: Always
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: bunkerweb-db
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: bunkerweb-db
-  template:
-    metadata:
-      labels:
-        app: bunkerweb-db
-    spec:
-      containers:
-        - name: bunkerweb-db
-          image: mariadb:10.10
-          imagePullPolicy: Always
-          env:
-            - name: MYSQL_RANDOM_ROOT_PASSWORD
-              value: "yes"
-            - name: "MYSQL_DATABASE"
-              value: "db"
-            - name: "MYSQL_USER"
-              value: "bunkerweb"
-            - name: "MYSQL_PASSWORD"
-              value: "changeme"
-          volumeMounts:
-            - mountPath: "/var/lib/mysql"
-              name: vol-db
-      volumes:
-        - name: vol-db
-          persistentVolumeClaim:
-            claimName: pvc-bunkerweb
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   name: bunkerweb-ui
 spec:
@@ -300,7 +242,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "YES"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
+              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
 ---
 apiVersion: v1
 kind: Service
@@ -363,7 +305,6 @@ spec:
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-bunkerweb
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

misc/integrations/k8s.mysql.yml

@@ -124,7 +124,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -150,7 +150,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "mysql+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -257,4 +257,3 @@ spec:
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-bunkerweb

misc/integrations/k8s.postgres.ui.yml

@@ -124,7 +124,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -151,7 +151,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -201,6 +201,8 @@ spec:
               value: "bunkerweb"
             - name: "POSTGRES_PASSWORD"
               value: "changeme"
+            - name: "PGDATA"
+              value: "/var/lib/postgresql/data/pgdata"
           volumeMounts:
             - mountPath: "/var/lib/postgresql/data"
               name: vol-db
@@ -240,7 +242,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "YES"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:testor@svc-bunkerweb-db:3306/db"
+              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
 ---
 apiVersion: v1
 kind: Service
@@ -303,7 +305,6 @@ spec:
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-bunkerweb
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

misc/integrations/k8s.postgres.yml

@@ -124,7 +124,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -150,7 +150,7 @@ spec:
             - name: KUBERNETES_MODE
               value: "yes"
             - name: "DATABASE_URI"
-              value: "mariadb+pymysql://bunkerweb:changeme@svc-bunkerweb-db:3306/db"
+              value: "postgresql://bunkerweb:changeme@svc-bunkerweb-db:5432/db"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -200,6 +200,8 @@ spec:
               value: "bunkerweb"
             - name: "POSTGRES_PASSWORD"
               value: "changeme"
+            - name: "PGDATA"
+              value: "/var/lib/postgresql/data/pgdata"
           volumeMounts:
             - mountPath: "/var/lib/postgresql/data"
               name: vol-db
@@ -255,4 +257,3 @@ spec:
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-bunkerweb

tests/ansible/autoconf_playbook

@@ -38,4 +38,4 @@
       ansible.builtin.pause:
         seconds: 60
     - name: Restart GH runner
-      shell: systemctl restart actions.runner.*
+      shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

tests/ansible/docker_playbook

@@ -38,4 +38,4 @@
       ansible.builtin.pause:
         seconds: 60
     - name: Restart GH runner
-      shell: systemctl restart actions.runner.*
+      shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

tests/ansible/linux_playbook

@@ -38,4 +38,4 @@
       ansible.builtin.pause:
         seconds: 60
     - name: Restart GH runner
-      shell: systemctl restart actions.runner.*
+      shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*

tests/ansible/swarm_playbook

@@ -49,4 +49,4 @@
       ansible.builtin.pause:
         seconds: 60
     - name: Restart GH runner
-      shell: systemctl restart actions.runner.*
+      shell: chown -R user:user /opt/actions-runner/ && systemctl restart actions.runner.*