Standardize config.

loomio/db-init-job.yaml

@@ -8,7 +8,7 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: db-init
-        image: {{ .image }}
+        image: loomio/loomio:latest
         command:
         - /bin/bash
         - -c

loomio/deployment-worker.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: worker
-        image: {{ .workerImage }}
+        image: loomio/loomio:latest
         env:
         - name: TASK
           value: worker
@@ -46,7 +46,7 @@ spec:
               name: loomio-secrets
               key: secretCookieToken
         - name: ACTIVE_STORAGE_SERVICE
-          value: {{ .activeStorageService }}
+          value: local
         - name: SMTP_AUTH
           value: {{ .smtp.auth }}
         - name: SMTP_DOMAIN

loomio/deployment.yaml

@@ -4,6 +4,8 @@ metadata:
   name: loomio
 spec:
   replicas: 1
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       component: web
@@ -14,13 +16,13 @@ spec:
     spec:
       containers:
       - name: loomio
-        image: {{ .image }}
+        image: loomio/loomio:latest
         command:
         - /bin/bash
         - -c
         - |
           set -e
-          bundle exec rake db:schema:load db:seed
+          bundle exec rake db:migrate db:seed
           bundle exec thrust puma -C config/puma.rb
         ports:
         - containerPort: 3000
@@ -54,17 +56,17 @@ spec:
               name: loomio-secrets
               key: secretCookieToken
         - name: FORCE_SSL
-          value: "{{ .forceSSL }}"
+          value: "1"
         - name: USE_RACK_ATTACK
-          value: "{{ .useRackAttack }}"
+          value: "1"
         - name: PUMA_WORKERS
-          value: "{{ .pumaWorkers }}"
+          value: "2"
         - name: MIN_THREADS
-          value: "{{ .minThreads }}"
+          value: "5"
         - name: MAX_THREADS
-          value: "{{ .maxThreads }}"
+          value: "5"
         - name: ACTIVE_STORAGE_SERVICE
-          value: {{ .activeStorageService }}
+          value: local
         - name: SMTP_AUTH
           value: {{ .smtp.auth }}
         - name: SMTP_DOMAIN

loomio/manifest.yaml

@@ -1,7 +1,7 @@
 name: loomio
 is: loomio
 description: Loomio is a collaborative decision-making tool that makes it easy for groups to make decisions together
-version: 3.0.11
+version: 3.0.11-2
 icon: https://www.loomio.com/brand/logo_gold.svg
 requires:
   - name: postgres
@@ -10,39 +10,30 @@ requires:
   - name: smtp
 defaultConfig:
   namespace: loomio
-  externalDnsDomain: "{{ .cloud.domain }}"
-  image: loomio/loomio:latest
-  workerImage: loomio/loomio:latest
+  externalDnsDomain: '{{ .cloud.domain }}'
   appName: Loomio
-  domain: "loomio.{{ .cloud.domain }}"
+  domain: 'loomio.{{ .cloud.domain }}'
   tlsSecretName: wildcard-wild-cloud-tls
-  port: 3000
   storage:
     uploads: 5Gi
     files: 5Gi
     plugins: 1Gi
-  redisUrl: "{{ .apps.redis.uri }}"
-  adminEmail: "{{ .operator.email }}"
-  supportEmail: "{{ .operator.email }}"
-  forceSSL: "1"
-  useRackAttack: "1"
-  pumaWorkers: "2"
-  minThreads: "5"
-  maxThreads: "5"
-  activeStorageService: local
+  redisUrl: '{{ .apps.redis.uri }}'
+  adminEmail: '{{ .operator.email }}'
+  supportEmail: '{{ .operator.email }}'
   db:
     name: loomio
     user: loomio
-    host: "{{ .apps.postgres.host }}"
-    port: "{{ .apps.postgres.port }}"
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
   smtp:
     auth: plain
-    domain: "{{ .cloud.domain }}"
-    host: "{{ .apps.smtp.host }}"
-    port: "{{ .apps.smtp.port }}"
-    user: "{{ .apps.smtp.user }}"
-    tls: "{{ .apps.smtp.tls }}"
-    from: "{{ .apps.smtp.from }}"
+    domain: '{{ .cloud.domain }}'
+    host: '{{ .apps.smtp.host }}'
+    port: '{{ .apps.smtp.port }}'
+    user: '{{ .apps.smtp.user }}'
+    tls: '{{ .apps.smtp.tls }}'
+    from: '{{ .apps.smtp.from }}'
 defaultSecrets:
   - key: dbPassword
     default: "{{ random.AlphaNum 32 }}"