From 671db37f730c562d837d441381315c9c94bc583a Mon Sep 17 00:00:00 2001
From: bunkerity <contact@bunkerity.com>
Date: Tue, 28 Mar 2023 17:43:10 +0200
Subject: [PATCH] fix autoconf/cors, fix docker/wordpress, fix wrong image name
 for k8s/scheduler and upgrade tests instances for swarm/k8s

---
 examples/cors/autoconf.yml            |  4 ++--
 examples/wordpress/docker-compose.yml |  6 +++---
 misc/integrations/k8s.mariadb.yml     |  8 ++++++--
 misc/integrations/swarm.mariadb.yml   | 16 ++++++++++++++++
 tests/SwarmTest.py                    |  2 +-
 tests/terraform/k8s.tf                |  2 +-
 tests/terraform/swarm.tf              |  2 +-
 7 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/examples/cors/autoconf.yml b/examples/cors/autoconf.yml
index 6783ffe7..4dcacd97 100644
--- a/examples/cors/autoconf.yml
+++ b/examples/cors/autoconf.yml
@@ -21,7 +21,7 @@ services:
       - bunkerweb.REMOTE_PHP_PATH=/app
 
   myapp2:
-    image: php:fpm-alpine
+    image: php:fpm
     networks:
       bw-services:
         aliases:
@@ -38,7 +38,7 @@ services:
       - bunkerweb.REMOTE_PHP_PATH=/app
 
   myapp3:
-    image: php:fpm-alpine
+    image: php:fpm
     networks:
       bw-services:
         aliases:
diff --git a/examples/wordpress/docker-compose.yml b/examples/wordpress/docker-compose.yml
index 2776a6fd..7123b8d2 100644
--- a/examples/wordpress/docker-compose.yml
+++ b/examples/wordpress/docker-compose.yml
@@ -51,9 +51,9 @@ services:
       - wp-data:/var/www/html
     environment:
       - WORDPRESS_DB_HOST=mydb
-      - WORDPRESS_DB_NAME=${WORDPRESS_DATABASE:-wp}
-      - WORDPRESS_DB_USER=${WORDPRESS_USER:-user}
-      - WORDPRESS_DB_PASSWORD=${WORDPRESS_PASSWORD:-secret} # set a stronger password in a .env file (must match MYSQL_PASSWORD)
+      - WORDPRESS_DB_NAME=wp
+      - WORDPRESS_DB_USER=user
+      - WORDPRESS_DB_PASSWORD=db-user-pwd # set a stronger password in a .env file (must match MYSQL_PASSWORD)
       - WORDPRESS_TABLE_PREFIX=prefix_ # best practice : replace with a random prefix
     networks:
       - bw-services
diff --git a/misc/integrations/k8s.mariadb.yml b/misc/integrations/k8s.mariadb.yml
index 179bcf73..70f6d2e8 100644
--- a/misc/integrations/k8s.mariadb.yml
+++ b/misc/integrations/k8s.mariadb.yml
@@ -77,6 +77,10 @@ spec:
               value: ""
             - name: MULTISITE
               value: "yes"
+            - name: USE_REDIS
+              value: "yes"
+            - name: REDIS_HOST
+              value: "svc-bunkerweb-redis"
           livenessProbe:
             exec:
               command:
@@ -142,8 +146,8 @@ spec:
         app: bunkerweb-scheduler
     spec:
       containers:
-        - name: bunkerweb-controller
-          image: bunkerity/bunkerweb-autoconf:1.4.6
+        - name: bunkerweb-scheduler
+          image: bunkerity/bunkerweb-scheduler:1.4.6
           imagePullPolicy: Always
           env:
             - name: KUBERNETES_MODE
diff --git a/misc/integrations/swarm.mariadb.yml b/misc/integrations/swarm.mariadb.yml
index 95736ac5..e95af2ef 100644
--- a/misc/integrations/swarm.mariadb.yml
+++ b/misc/integrations/swarm.mariadb.yml
@@ -40,6 +40,10 @@ services:
     networks:
       - bw-universe
       - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
 
   bw-docker:
     image: tecnativa/docker-socket-proxy
@@ -67,6 +71,10 @@ services:
     networks:
       - bw-universe
       - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
 
   bw-db:
     image: mariadb:10.10
@@ -79,11 +87,19 @@ services:
       - bw-data:/var/lib/mysql
     networks:
       - bw-docker
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
 
   bw-redis:
     image: redis:7-alpine
     networks:
       - bw-universe
+    deploy:
+      placement:
+        constraints:
+          - "node.role == worker"
 
 volumes:
   bw-data:
diff --git a/tests/SwarmTest.py b/tests/SwarmTest.py
index 87b2c16c..8f5b41dc 100644
--- a/tests/SwarmTest.py
+++ b/tests/SwarmTest.py
@@ -71,7 +71,7 @@ class SwarmTest(Test):
                 i += 1
             if not healthy:
                 proc = run(
-                    "docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler ; docker service logs bunkerweb_bw-db",
+                    "docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler ; docker service logs bunkerweb_bw-db ; docker service logs bunkerweb_bw-redis ; docker stack ps --no-trunc bunkerweb",
                     cwd="/tmp/swarm",
                     shell=True,
                     capture_output=True,
diff --git a/tests/terraform/k8s.tf b/tests/terraform/k8s.tf
index 66672e64..7b7c80f9 100644
--- a/tests/terraform/k8s.tf
+++ b/tests/terraform/k8s.tf
@@ -20,7 +20,7 @@ resource "scaleway_k8s_cluster" "cluster" {
 resource "scaleway_k8s_pool" "pool" {
   cluster_id = scaleway_k8s_cluster.cluster.id
   name = "bw_k8s"
-  node_type = "DEV1-M"
+  node_type = "DEV1-L"
   size = 3
   wait_for_pool_ready = true
 }
diff --git a/tests/terraform/swarm.tf b/tests/terraform/swarm.tf
index 8aad3073..b0d3bab7 100644
--- a/tests/terraform/swarm.tf
+++ b/tests/terraform/swarm.tf
@@ -24,7 +24,7 @@ resource "scaleway_instance_server" "instances" {
   count = 3
   depends_on = [scaleway_account_ssh_key.ssh_key]
   name = "cicd_bw_swarm_${count.index}"
-  type = "DEV1-M"
+  type = "DEV1-L"
   image = "debian_bullseye"
   ip_id = var.swarm_ips_id[count.index]
   private_network {