From 7bf8e6976a14a1bb3d1a06135c17211d6530a1c3 Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Tue, 1 Oct 2024 12:04:42 +0200 Subject: [PATCH] feat(helmfile): Full ArgoCD support --- .../values-opendesk-keycloak-bootstrap.yaml.gotmpl | 4 ++++ .../values-openxchange-bootstrap.yaml.gotmpl | 3 +-- .../apps/open-xchange/values-openxchange.yaml.gotmpl | 4 ++-- helmfile/apps/openproject-bootstrap/values.yaml.gotmpl | 2 -- helmfile/apps/openproject/values.yaml.gotmpl | 2 ++ helmfile/apps/services/values-mariadb.yaml.gotmpl | 4 +++- helmfile/apps/services/values-postgresql.yaml.gotmpl | 8 ++++---- helmfile/environments/default/charts.yaml | 10 +++++----- helmfile/shared/migrations.yaml.gotmpl | 4 ++++ 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl b/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl index 762d1093..bddcc0a0 100644 --- a/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl +++ b/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl @@ -534,6 +534,10 @@ containerSecurityContext: seLinuxOptions: {{ .Values.seLinuxOptions.opendeskKeycloakBootstrap | toYaml | nindent 4 }} +additionalAnnotations: + argocd.argoproj.io/hook: "Sync" + argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation" + podAnnotations: intents.otterize.com/service-name: "ums-keycloak-bootstrap" diff --git a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl index c7b625d4..e5adef09 100644 --- a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl +++ b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl @@ -13,7 +13,6 @@ containerSecurityContext: capabilities: drop: - "ALL" - enabled: true runAsUser: 1000 runAsGroup: 1000 seccompProfile: @@ -32,7 +31,7 @@ image: imagePullSecrets: {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }} -podAnnotations: +additionalAnnotations: argocd.argoproj.io/hook: "Sync" argocd.argoproj.io/hook-delete-policy: "HookSucceeded" ... diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl index 777b93ca..9f7393df 100644 --- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl +++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl @@ -165,8 +165,8 @@ appsuite: type: "RuntimeDefault" seLinuxOptions: {{ .Values.seLinuxOptions.openxchangeGotenberg | toYaml | nindent 10 }} - serviceAccount: - create: false + serviceAccount: + create: false hooks: beforeAppsuiteStart: create-guard-dir.sh: | diff --git a/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl b/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl index ef7fb857..c44d27a8 100644 --- a/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl +++ b/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl @@ -53,8 +53,6 @@ image: job: enabled: true -podAnnotations: {} - podSecurityContext: enabled: true fsGroup: 1000 diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index a0f27449..c5909530 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -188,6 +188,8 @@ s3: seederJob: annotations: intents.otterize.com/service-name: "openproject-seeder" + argocd.argoproj.io/hook: "Sync" + argocd.argoproj.io/hook-delete-policy: "HookSucceeded" resources: {{ .Values.resources.openprojectSeederJob | toYaml | nindent 4 }} diff --git a/helmfile/apps/services/values-mariadb.yaml.gotmpl b/helmfile/apps/services/values-mariadb.yaml.gotmpl index 93474aa7..93a5f1e9 100644 --- a/helmfile/apps/services/values-mariadb.yaml.gotmpl +++ b/helmfile/apps/services/values-mariadb.yaml.gotmpl @@ -73,7 +73,9 @@ persistence: storageClass: {{ .Values.persistence.storageClassNames.RWO | quote }} size: {{ .Values.persistence.size.mariadb | quote }} -podAnnotations: {} +podAnnotations: + argocd.argoproj.io/hook: "PostSync" + argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation" podSecurityContext: enabled: true diff --git a/helmfile/apps/services/values-postgresql.yaml.gotmpl b/helmfile/apps/services/values-postgresql.yaml.gotmpl index f36c7230..7ba5ed09 100644 --- a/helmfile/apps/services/values-postgresql.yaml.gotmpl +++ b/helmfile/apps/services/values-postgresql.yaml.gotmpl @@ -29,9 +29,6 @@ podSecurityContext: fsGroup: 1001 fsGroupChangePolicy: "OnRootMismatch" -postgres: - user: "postgres" - replicaCount: {{ .Values.replicas.postgres }} global: @@ -90,9 +87,12 @@ persistence: storageClass: {{ .Values.persistence.storageClassNames.RWO | quote }} size: {{ .Values.persistence.size.postgresql | quote }} -podAnnotations: {} +podAnnotations: + argocd.argoproj.io/hook: "PostSync" + argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation" postgres: + user: "postgres" password: {{ .Values.secrets.postgresql.postgresUser | quote }} resources: diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index e3c12ee0..5a0c87d2 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -132,7 +132,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-jitsi" name: "opendesk-jitsi" - version: "1.12.1" + version: "1.12.3" verify: true mariadb: # providerCategory: "Platform" @@ -232,7 +232,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "3.3.4" + version: "3.3.5" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -242,7 +242,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "3.3.4" + version: "3.3.5" verify: true nginx: # providerCategory: "Community" @@ -296,7 +296,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-openproject-bootstrap" name: "opendesk-openproject-bootstrap" - version: "2.0.0" + version: "2.1.1" verify: true openXchangeAppSuite: # providerCategory: "Supplier" @@ -318,7 +318,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-open-xchange-bootstrap" name: "opendesk-open-xchange-bootstrap" - version: "2.1.0" + version: "2.1.2" verify: true otterize: # providerCategory: "Platform" diff --git a/helmfile/shared/migrations.yaml.gotmpl b/helmfile/shared/migrations.yaml.gotmpl index 8d9039ee..cbe607ae 100644 --- a/helmfile/shared/migrations.yaml.gotmpl +++ b/helmfile/shared/migrations.yaml.gotmpl @@ -10,6 +10,10 @@ global: imagePullSecrets: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} +additionalAnnotations: + argocd.argoproj.io/hook: "Sync" + argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation" + cleanup: deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }} keepPVCOnDelete: {{ .Values.debug.cleanup.keepPVCOnDelete }}