chore(deploy): use the Rodolf chart to deploy this cube

deploy/helmfile.yaml

@@ -14,8 +14,8 @@
 
 releases:
   - name: {{ requiredEnv "CI_ENVIRONMENT_NAME" }}
-    chart: logilab/cubicweb
-    version: 0.15.0
+    chart: logilab/rodolf
+    version: 0.1.1
     atomic: true
     wait: true
     timeout: 900
@@ -23,14 +23,3 @@
     createNamespace: false
     values:
       - values.yaml.gotmpl
-
-  - name: {{ requiredEnv "CI_ENVIRONMENT_NAME" }}-front
-    chart: logilab/web-app
-    version: 0.2.1
-    atomic: true
-    wait: true
-    timeout: 900
-    namespace: rodolf
-    createNamespace: false
-    values:
-      - values-front.yaml.gotmpl

deploy/values-front.yaml.gotmpl

-appName: rodolf
-host: {{ .StateValues.frontHost }}
-
-port: 3000
-
-image:
-  repo: {{ requiredEnv "CI_REGISTRY_IMAGE" }}/frontend
-  tag: {{ .StateValues.deployTag | ternary (requiredEnv "CI_COMMIT_REF_NAME") (requiredEnv "CI_COMMIT_HG_SHORT_SHA") }}
-  pullPolicy: Always
-
-env:
-  RODOLF_API_URL: https://rodolf-api.k.intra.logilab.fr/api
-
-ingress:
-  noindex: true
-  clusterIssuer: false
-  tlsSecret: false

deploy/values.yaml.gotmpl

-host: {{ .StateValues.host }}
-
-image: {{ requiredEnv "CI_REGISTRY_IMAGE" }}
-imageTag: {{ .StateValues.deployTag | ternary (requiredEnv "CI_COMMIT_REF_NAME") (requiredEnv "CI_COMMIT_HG_SHORT_SHA") }}
-
-backupPvcClaimName: backup
+cubicweb:
+  host: {{ .StateValues.host }}
 
@@ -7,8 +3,3 @@
 
-readinessProbe:
-  enabled: true
-  url: /login
-livenessProbe:
-  enabled: true
-  url: /login
+  imageTag: {{ .StateValues.deployTag | ternary (requiredEnv "CI_COMMIT_REF_NAME") (requiredEnv "CI_COMMIT_HG_SHORT_SHA") }}
 
@@ -14,4 +5,13 @@
 
-sessionsInRedis: true
-scheduler: true
+  ingress:
+    clusterIssuer: null
+    tls:
+      withSecret: false
+    annotations:
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        more_set_headers "Vary: Origin";
+      nginx.ingress.kubernetes.io/enable-cors: "false"
+      nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS"
+      nginx.ingress.kubernetes.io/cors-allow-headers: "Content-Type, X-Client-Name"
+      nginx.ingress.kubernetes.io/cors-allow-origin: https://{{ .StateValues.frontHost }}
 
@@ -17,16 +17,9 @@
 
-ingress:
-  noindex: true
-  clusterIssuer: null
-  enabled: true
-  tls:
-    withSecret: false
-  annotations:
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      more_set_headers "Vary: Origin";
-      more_set_headers "Access-Control-Allow-Origin: https://rodolf.k.intra.logilab.fr";
-      more_set_headers "Access-Control-Allow-Credentials: true";
-      more_set_headers "Access-Control-Allow-Methods: GET,POST,OPTIONS";
-      more_set_headers "Access-Control-Allow-Headers: Content-Type, X-Client-Name";
-    nginx.ingress.kubernetes.io/enable-cors: "false"
+  backupBeforeCwUpgrade: {{ .StateValues.backupBeforeCwUpgrade }}
+  restoreDbWithLatestBackupBeforeHelmRelease: {{ .StateValues.restoreDbWithLatestBackupBeforeHelmRelease }}
+  backupCronJob: {{ .StateValues.backupCronJob }}
+
+  runDbInitBeforeHelmRelease: {{ .StateValues.runDbInitBeforeHelmRelease }}
+  resetDbBeforeHelmRelease: {{ .StateValues.resetDbBeforeHelmRelease }}
+  dropDbAfterDeletingHelmRelease: {{ .StateValues.dropDbAfterDeletingHelmRelease }}
 
@@ -32,21 +25,14 @@
 
-worker:
-  enabled: true
-  args: ["cubicweb-ctl", "rq-worker", "instance"]
-  resources:
-    requests:
-      cpu: 50m
-      memory: 200Mi
-    limits:
-      memory: 200Mi
-
-# backup
-backupBeforeCwUpgrade: {{ .StateValues.backupBeforeCwUpgrade }}
-restoreDbWithLatestBackupBeforeHelmRelease: {{ .StateValues.restoreDbWithLatestBackupBeforeHelmRelease }}
-backupCronJob: {{ .StateValues.backupCronJob }}
-
-# database
-runDbInitBeforeHelmRelease: true
-resetDbBeforeHelmRelease: {{ .StateValues.resetDbBeforeHelmRelease }}
-dropDbAfterDeletingHelmRelease: {{ .StateValues.dropDbAfterDeletingHelmRelease }}
+  env:
+    AWS_S3_ENDPOINT_URL: https://minio.k.intra.logilab.fr
+    CW_ACCESS_CONTROL_ALLOW_HEADERS: "*"
+    CW_ACCESS_CONTROL_ALLOW_METHODS: GET, POST, OPTIONS
+    CW_ACCESS_CONTROL_ALLOW_ORIGIN: https://{{ .StateValues.frontHost }}
+    CW_ACCESS_CONTROL_MAX_AGE: "1728000"
+    CW_DB_HOST: pg.intra.logilab.fr
+    CW_DB_PORT: 5432
+    CW_DB_NAME: rodolf
+    CW_DB_USER: rodolf
+    PYRAMID_API_ENABLE_LOGIN_ROUTE: "yes"
+    RODOLF_S3_BUCKET: rodolf
 
@@ -52,14 +38,8 @@
 
-env:
-  AWS_S3_ENDPOINT_URL: https://minio.k.intra.logilab.fr
-  CW_ACCESS_CONTROL_ALLOW_HEADERS: "*"
-  CW_ACCESS_CONTROL_ALLOW_METHODS: GET, POST, OPTIONS
-  CW_ACCESS_CONTROL_ALLOW_ORIGIN: https://rodolf.k.intra.logilab.fr
-  CW_ACCESS_CONTROL_MAX_AGE: "1728000"
-  CW_DB_HOST: pg.intra.logilab.fr
-  CW_DB_PORT: 5432
-  CW_DB_NAME: rodolf
-  CW_DB_USER: rodolf
-  PYRAMID_API_ENABLE_LOGIN_ROUTE: "yes"
-  RODOLF_S3_BUCKET: rodolf
+  secretEnv:
+    AWS_ACCESS_KEY_ID: {{ .StateValues.s3AccessKeyId }}
+    AWS_SECRET_ACCESS_KEY: {{ .StateValues.s3AccessKeySecret }}
+    CW_PASSWORD: {{ .StateValues.cwPassword }}
+    CW_DB_PASSWORD: {{ .StateValues.cwDbPassword }}
+    REDIS_SESSIONS_SECRET: {{ .StateValues.redisSessionsSecret }}
 
@@ -65,7 +45,10 @@
 
-secretEnv:
-  AWS_ACCESS_KEY_ID: {{ .StateValues.s3AccessKeyId }}
-  AWS_SECRET_ACCESS_KEY: {{ .StateValues.s3AccessKeySecret }}
-  CW_PASSWORD: {{ .StateValues.cwPassword }}
-  CW_DB_PASSWORD: {{ .StateValues.cwDbPassword }}
-  REDIS_SESSIONS_SECRET: {{ .StateValues.redisSessionsSecret }}
+web-app:
+  host: {{ .StateValues.frontHost }}
+
+  image:
+    tag: {{ .StateValues.deployTag | ternary (requiredEnv "CI_COMMIT_REF_NAME") (requiredEnv "CI_COMMIT_HG_SHORT_SHA") }}
+    pullPolicy: Always
+
+  env:
+    RODOLF_API_URL: https://{{ .StateValues.host }}/api

deploy/values_default.yaml

@@ -5,5 +5,6 @@
 restoreDbWithLatestBackupBeforeHelmRelease: false
 backupCronJob: false
 
+runDbInitBeforeHelmRelease: false
 resetDbBeforeHelmRelease: false
 dropDbAfterDeletingHelmRelease: false