fix(helmfile): Streamline commonLabels.deployStage.

2025-12-06 15:31:38 +01:00 · 2024-11-29 11:59:36 +01:00
parent 56ce3355fc
commit f96942536f
15 changed files with 35 additions and 35 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,11 +36,11 @@ stages:
  - "env-cleanup"
  - "env"
  - "pre-services-deploy"
-  - "migrations-pre"
-  - "basic-services-deploy"
-  - "component-deploy-stage-1"
-  - "component-deploy-stage-2"
-  - "migrations-post"
+  - "010-migrations-pre"
+  - "030-services"
+  - "050-components"
+  - "060-components"
+  - "090-migrations-post"
  - "lint"
  - "tests"
  - "env-stop"
@@ -278,7 +278,7 @@ policies-deploy:
    ADDITIONAL_ARGS: "-l name=opendesk-otterize"

 migrations-pre:
-  stage: "migrations-pre"
+  stage: "010-migrations-pre"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -290,7 +290,7 @@ migrations-pre:
    COMPONENT: "migrations-pre"

 migrations-post:
-  stage: "migrations-post"
+  stage: "090-migrations-post"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -302,7 +302,7 @@ migrations-post:
    COMPONENT: "migrations-post"

 services-deploy:
-  stage: "basic-services-deploy"
+  stage: "030-services"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -314,7 +314,7 @@ services-deploy:
    COMPONENT: "services"

 nubus-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -326,7 +326,7 @@ nubus-deploy:
    COMPONENT: "nubus"

 ox-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  timeout: "30m"
  rules:
@@ -339,7 +339,7 @@ ox-deploy:
    COMPONENT: "open-xchange"

 xwiki-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -351,7 +351,7 @@ xwiki-deploy:
    COMPONENT: "xwiki"

 collabora-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -363,7 +363,7 @@ collabora-deploy:
    COMPONENT: "collabora"

 cryptpad-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -375,7 +375,7 @@ cryptpad-deploy:
    COMPONENT: "cryptpad"

 nextcloud-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -387,7 +387,7 @@ nextcloud-deploy:
    COMPONENT: "nextcloud"

 openproject-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -399,7 +399,7 @@ openproject-deploy:
    COMPONENT: "openproject"

 openproject-bootstrap-deploy:
-  stage: "component-deploy-stage-2"
+  stage: "060-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -411,7 +411,7 @@ openproject-bootstrap-deploy:
    COMPONENT: "openproject-bootstrap"

 jitsi-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
@@ -423,7 +423,7 @@ jitsi-deploy:
    COMPONENT: "jitsi"

 element-deploy:
-  stage: "component-deploy-stage-1"
+  stage: "050-components"
  extends: ".deploy-common"
  rules:
    - if: >
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
  * [From v1.0.0](#from-v100)
    * [Pre-upgrade: Manual checks/steps](#pre-upgrade-manual-checkssteps)
      * [Streamlining `openxchange` and `oxAppSuite` attribute names.](#streamlining-openxchange-and-oxappsuite-attribute-names)
-      * [`customization.release`](#customizationrelease)
+      * [Dicts to define `customization.release`](#dicts-to-define-customizationrelease)
      * [Redis 7.4](#redis-74)
  * [From v0.9.0](#from-v090)
    * [Pre-upgrade: Manual steps](#pre-upgrade-manual-steps)
@@ -131,7 +131,7 @@ WAS: secrets.oxAppsuite: ...
 NOW: secrets.oxAppSuite: ...
 ```

-#### `customization.release`
+#### Dicts to define `customization.release`

 If you make use of the `customization.release` option, you have to switch to a dictionary based definition of customization files e.g. from

--- a/helmfile/apps/collabora/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/collabora/helmfile-child.yaml.gotmpl
@@ -24,6 +24,6 @@ releases:
    installed: {{ .Values.collabora.enabled }}

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "collabora"
 ...
--- a/helmfile/apps/cryptpad/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/cryptpad/helmfile-child.yaml.gotmpl
@@ -24,6 +24,6 @@ releases:
    installed: {{ .Values.cryptpad.enabled }}

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "cryptpad"
 ...
--- a/helmfile/apps/element/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/element/helmfile-child.yaml.gotmpl
@@ -187,6 +187,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "element"
 ...
--- a/helmfile/apps/jitsi/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/jitsi/helmfile-child.yaml.gotmpl
@@ -25,6 +25,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "jitsi"
 ...
--- a/helmfile/apps/migrations-post/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/migrations-post/helmfile-child.yaml.gotmpl
@@ -28,6 +28,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-0"
-  component: "opendesk-migrations"
+  deployStage: "090-migrations-post"
+  component: "migrations-post"
 ...
--- a/helmfile/apps/migrations-pre/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/migrations-pre/helmfile-child.yaml.gotmpl
@@ -28,6 +28,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-0"
-  component: "opendesk-migrations"
+  deployStage: "010-migrations-pre"
+  component: "migrations-pre"
 ...
--- a/helmfile/apps/nextcloud/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/helmfile-child.yaml.gotmpl
@@ -45,6 +45,6 @@ releases:
    installed: {{ .Values.nextcloud.enabled }}

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "nextcloud"
 ...
--- a/helmfile/apps/nubus/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/nubus/helmfile-child.yaml.gotmpl
@@ -89,6 +89,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "nubus"
 ...
--- a/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl
@@ -87,6 +87,6 @@ releases:
      - "open-xchange"

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "open-xchange"
 ...
--- a/helmfile/apps/openproject-bootstrap/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/openproject-bootstrap/helmfile-child.yaml.gotmpl
@@ -27,6 +27,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "component-2"
+  deployStage: "060-components"
  component: "opendesk-openproject-bootstrap"
 ...
--- a/helmfile/apps/openproject/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/openproject/helmfile-child.yaml.gotmpl
@@ -27,6 +27,6 @@ releases:
    timeout: 1800

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "openproject"
 ...
--- a/helmfile/apps/services/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/services/helmfile-child.yaml.gotmpl
@@ -246,6 +246,6 @@ releases:
    timeout: 900

 commonLabels:
-  deploy-stage: "services"
+  deployStage: "030-services"
  component: "services"
 ...
--- a/helmfile/apps/xwiki/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/xwiki/helmfile-child.yaml.gotmpl
@@ -26,6 +26,6 @@ releases:
    timeout: 1800

 commonLabels:
-  deploy-stage: "component-1"
+  deployStage: "050-components"
  component: "xwiki"
 ...