Weekly Deploy - 24 (#43)

* Prepare analytics-credentials-file.json * Replace memory_hard_limit with memory_max * Improve comments * Bump mediawiki docker image * test: Retry to start Nomad
femiwiki · Jun 18, 2021 · d2ec075 · d2ec075
1 parent e633b5c
commit d2ec075
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 76 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,7 +59,14 @@ jobs:
       - name: Wait for initializing...
         timeout-minutes: 5
         run: |
+          TIME=0
           until nomad node status > /dev/null; do
+            if [ $TIME -gt 30 ]; then
+              if [ -n "$(pidof nomad)" ]; then sudo kill "$(pidof nomad)"; fi
+              sudo nomad agent -dev-connect -config nomad/development.hcl &>/dev/null &
+              TIME=0
+            fi
+            ((TIME+=1))
             sleep 1; done;
           NODE_ID="$(nomad node status -self | head -1 | awk '{print $3}')"
           until [[ $(curl -s "http://127.0.0.1:4646/v1/node/$NODE_ID") = *"consul.version"* ]]; do

diff --git a/jobs-consul-test/backupbot.nomad b/jobs-consul-test/backupbot.nomad
@@ -41,11 +41,9 @@ job "backupbot" {
         }
 
         sidecar_task {
-          config {
-            memory_hard_limit = 300
-          }
           resources {
-            memory = 30
+            memory     = 30
+            memory_max = 300
           }
         }
       }

diff --git a/jobs-consul-test/development/lb.nomad b/jobs-consul-test/development/lb.nomad
@@ -33,7 +33,6 @@ job "lb" {
       config {
         image             = "traefik:v2.4.8"
         network_mode      = "host"
-        memory_hard_limit = 500
         ports             = ["http", "api"]
 
         volumes = [
@@ -67,6 +66,7 @@ EOF
 
       resources {
         memory = 128
+        memory_max = 500
       }
     }
   }

diff --git a/jobs-consul-test/development/mathoid.nomad b/jobs-consul-test/development/mathoid.nomad
@@ -7,11 +7,11 @@ job "mathoid" {
 
       config {
         image = "ghcr.io/femiwiki/mathoid:latest"
-        memory_hard_limit = 600
       }
 
       resources {
         memory = 150
+        memory_max = 600
       }
 
       env {
@@ -32,11 +32,9 @@ job "mathoid" {
         sidecar_service {}
 
         sidecar_task {
-          config {
-            memory_hard_limit = 500
-          }
           resources {
             memory = 100
+        memory_max = 500
           }
         }
       }

diff --git a/jobs-consul-test/fastcgi.nomad b/jobs-consul-test/fastcgi.nomad
@@ -32,6 +32,12 @@ job "fastcgi" {
         mode        = "file"
       }
 
+      artifact {
+        source      = "s3::https://femiwiki-secrets.s3-ap-northeast-1.amazonaws.com/analytics-credentials-file.json"
+        destination = "secrets/analytics-credentials-file.json"
+        mode        = "file"
+      }
+
       artifact {
         source      = "https://github.com/femiwiki/nomad/raw/main/php/opcache-recommended.ini"
         destination = "local/opcache-recommended.ini"
@@ -63,11 +69,12 @@ job "fastcgi" {
       }
 
       config {
-        image = "ghcr.io/femiwiki/mediawiki:2021-05-28T22-03-473c97b0"
+        image = "ghcr.io/femiwiki/mediawiki:latest"
         ports = ["fastcgi"]
 
         volumes = [
           "secrets/secrets.php:/a/secret.php",
+          "secrets/analytics-credentials-file.json:/a/analytics-credentials-file.json",
           "local/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini",
           "local/php.ini:/usr/local/etc/php/php.ini",
           "local/php-fpm.conf:/usr/local/etc/php-fpm.conf",
@@ -90,12 +97,11 @@ job "fastcgi" {
             readonly = false
           },
         ]
-
-        memory_hard_limit = 800
       }
 
       resources {
-        memory = 300
+        memory     = 300
+        memory_max = 800
       }
 
       env {
@@ -150,11 +156,9 @@ job "fastcgi" {
         }
 
         sidecar_task {
-          config {
-            memory_hard_limit = 300
-          }
           resources {
-            memory = 30
+            memory     = 30
+            memory_max = 300
           }
         }
       }

diff --git a/jobs-consul-test/http.nomad b/jobs-consul-test/http.nomad
@@ -12,7 +12,7 @@ job "http" {
       }
 
       config {
-        image   = "ghcr.io/femiwiki/mediawiki:2021-05-28T14-01-0b1f9738"
+        image   = "ghcr.io/femiwiki/mediawiki:latest"
         command = "caddy"
         args    = ["run"]
         volumes = ["local/Caddyfile:/srv/femiwiki.com/Caddyfile"]
@@ -34,12 +34,11 @@ job "http" {
         ulimit {
           nofile = "20000:40000"
         }
-
-        memory_hard_limit = 400
       }
 
       resources {
-        memory = 100
+        memory     = 100
+        memory_max = 400
       }
 
       env {
@@ -90,11 +89,9 @@ job "http" {
         }
 
         sidecar_task {
-          config {
-            memory_hard_limit = 500
-          }
           resources {
-            memory = 300
+            memory     = 300
+            memory_max = 500
           }
         }
       }

diff --git a/jobs-consul-test/lb.nomad b/jobs-consul-test/lb.nomad
@@ -56,12 +56,11 @@ job "lb" {
             readonly = false
           },
         ]
-
-        memory_hard_limit = 500
       }
 
       resources {
-        memory = 128
+        memory     = 128
+        memory_max = 500
       }
     }
   }

diff --git a/jobs-consul-test/mathoid.nomad b/jobs-consul-test/mathoid.nomad
@@ -31,11 +31,9 @@ job "mathoid" {
         sidecar_service {}
 
         sidecar_task {
-          config {
-            memory_hard_limit = 500
-          }
           resources {
-            memory = 300
+            memory     = 300
+            memory_max = 500
           }
         }
       }

diff --git a/jobs-consul-test/memcached.nomad b/jobs-consul-test/memcached.nomad
@@ -26,11 +26,9 @@ job "memcached" {
         sidecar_service {}
 
         sidecar_task {
-          config {
-            memory_hard_limit = 300
-          }
           resources {
-            memory = 30
+            memory     = 30
+            memory_max = 300
           }
         }
       }

diff --git a/jobs-consul-test/mysql.nomad b/jobs-consul-test/mysql.nomad
@@ -26,13 +26,13 @@ job "mysql" {
       }
 
       config {
-        image             = "mysql/mysql-server:8.0.25"
-        volumes           = ["local/my.cnf:/etc/mysql/my.cnf"]
-        memory_hard_limit = 800
+        image   = "mysql/mysql-server:8.0.25"
+        volumes = ["local/my.cnf:/etc/mysql/my.cnf"]
       }
 
       resources {
-        memory = 300
+        memory     = 300
+        memory_max = 800
       }
 
       env {
@@ -52,11 +52,9 @@ job "mysql" {
         sidecar_service {}
 
         sidecar_task {
-          config {
-            memory_hard_limit = 300
-          }
           resources {
-            memory = 30
+            memory     = 30
+            memory_max = 300
           }
         }
       }

diff --git a/jobs-consul-test/restbase.nomad b/jobs-consul-test/restbase.nomad
@@ -16,12 +16,11 @@ job "restbase" {
             readonly = false
           }
         ]
-
-        memory_hard_limit = 400
       }
 
       resources {
-        memory = 100
+        memory     = 100
+        memory_max = 400
       }
 
       env {
@@ -58,11 +57,9 @@ job "restbase" {
         }
 
         sidecar_task {
-          config {
-            memory_hard_limit = 500
-          }
           resources {
-            memory = 300
+            memory     = 300
+            memory_max = 500
           }
         }
       }

diff --git a/jobs/development/fastcgi.nomad b/jobs/development/fastcgi.nomad
@@ -39,7 +39,6 @@ job "fastcgi" {
       config {
         image             = "ghcr.io/femiwiki/mediawiki:latest"
         network_mode      = "host"
-        memory_hard_limit = 600
 
         volumes = [
           "secrets/secrets.php:/a/secret.php",
@@ -70,6 +69,7 @@ job "fastcgi" {
 
       resources {
         memory = 100
+        memory_max = 600
       }
     }
   }

diff --git a/jobs/development/http.nomad b/jobs/development/http.nomad
@@ -86,11 +86,11 @@ job "http" {
         ]
 
         network_mode      = "host"
-        memory_hard_limit = 400
       }
 
       resources {
         memory = 80
+        memory_max = 400
       }
     }
   }

diff --git a/jobs/development/mathoid.nomad b/jobs/development/mathoid.nomad
@@ -7,11 +7,11 @@ job "mathoid" {
 
       config {
         image = "ghcr.io/femiwiki/mathoid:latest"
-        memory_hard_limit = 600
       }
 
       resources {
         memory = 150
+        memory_max = 600
       }
 
       env {

diff --git a/jobs/development/memcached.nomad b/jobs/development/memcached.nomad
@@ -7,11 +7,11 @@ job "memcached" {
 
       config {
         image             = "memcached:1-alpine"
-        memory_hard_limit = 240
       }
 
       resources {
         memory = 60
+        memory_max = 240
       }
     }
 

diff --git a/jobs/development/mysql.nomad b/jobs/development/mysql.nomad
@@ -25,7 +25,6 @@ EOF
 
       config {
         image             = "mysql/mysql-server:8.0"
-        memory_hard_limit = 1000
         volumes           = ["local/my.cnf:/etc/mysql/my.cnf"]
 
         mounts = [
@@ -40,6 +39,7 @@ EOF
 
       resources {
         memory = 500
+        memory_max = 1000
       }
 
       env {

diff --git a/jobs/development/restbase.nomad b/jobs/development/restbase.nomad
@@ -8,11 +8,11 @@ job "restbase" {
       config {
         image             = "ghcr.io/femiwiki/restbase:latest"
         network_mode      = "host"
-        memory_hard_limit = 400
       }
 
       resources {
         memory = 100
+        memory_max = 400
       }
 
       env {