From f345019f404d5457322f9cbab77b0892b320ee13 Mon Sep 17 00:00:00 2001 From: Jo Date: Fri, 28 Jul 2023 18:52:52 +0200 Subject: [PATCH] fix: up maildev chart (#374) Co-authored-by: Julien Bouquillon --- plugins/contrib/Chart.yaml | 4 ---- plugins/contrib/values.yaml | 3 --- plugins/fabrique/Chart.yaml | 4 ++++ plugins/fabrique/charts/maildev/Chart.yaml | 8 ++++++++ plugins/fabrique/charts/maildev/values.yaml | 10 ++++++++++ plugins/fabrique/values.yaml | 2 ++ 6 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 plugins/fabrique/charts/maildev/Chart.yaml create mode 100644 plugins/fabrique/charts/maildev/values.yaml diff --git a/plugins/contrib/Chart.yaml b/plugins/contrib/Chart.yaml index 68050488a7..b588a0e475 100644 --- a/plugins/contrib/Chart.yaml +++ b/plugins/contrib/Chart.yaml @@ -45,10 +45,6 @@ dependencies: repository: file://./charts/job version: 1.136.2 condition: job.enabled - - name: maildev - degit: SocialGouv/helm-charts/charts/maildev@v1 - version: "1" - condition: maildev.enabled - name: metabase repository: file://./charts/metabase version: 1.136.2 diff --git a/plugins/contrib/values.yaml b/plugins/contrib/values.yaml index 47bf39737a..23e68fe516 100644 --- a/plugins/contrib/values.yaml +++ b/plugins/contrib/values.yaml @@ -1,8 +1,5 @@ contrib-helpers: enabled: true - -maildev: - enabled: false pgweb: enabled: false app: diff --git a/plugins/fabrique/Chart.yaml b/plugins/fabrique/Chart.yaml index f471c1cde4..012a8dae2b 100644 --- a/plugins/fabrique/Chart.yaml +++ b/plugins/fabrique/Chart.yaml @@ -10,6 +10,10 @@ dependencies: repository: file://./charts/pg version: 1.161.4 condition: pg.enabled + - name: maildev + repository: file://./charts/maildev + version: 1.136.3 + condition: maildev.enabled - name: keycloakx repository: https://codecentric.github.io/helm-charts version: 2.1.1 diff --git a/plugins/fabrique/charts/maildev/Chart.yaml b/plugins/fabrique/charts/maildev/Chart.yaml new file mode 100644 index 0000000000..7ce07e5da5 --- /dev/null +++ b/plugins/fabrique/charts/maildev/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: maildev +version: 1.136.3 +dependencies: + - name: maildev + degit: socialgouv/helm-charts/charts/maildev@v1 + condition: maildev.enabled + version: "1" \ No newline at end of file diff --git a/plugins/fabrique/charts/maildev/values.yaml b/plugins/fabrique/charts/maildev/values.yaml new file mode 100644 index 0000000000..efb7039fbc --- /dev/null +++ b/plugins/fabrique/charts/maildev/values.yaml @@ -0,0 +1,10 @@ +maildev: + enabled: true + ~tpl~host: '{{ tpl (or .Values.host (print (or .Values.component (index .Values.kontinuous.chartContext 2)) "-" (or .Values.global.host ""))) $ }}' + ~tpl~repositoryName: "{{ .Values.global.repositoryName }}" + ingress: + ~tpl~annotations: "{{ .Values.global.ingress.annotations | toJson }}" + persistence: + ~tpl~enabled: "{{ if (eq .Values.global.env `preprod`) }}true{{ else }}false{{ end }}" + cron: + ~tpl~enabled: "{{ if (eq .Values.global.env `preprod`) }}true{{ else }}false{{ end }}" \ No newline at end of file diff --git a/plugins/fabrique/values.yaml b/plugins/fabrique/values.yaml index 3b4cb11cdb..474ceb3f85 100644 --- a/plugins/fabrique/values.yaml +++ b/plugins/fabrique/values.yaml @@ -1,5 +1,7 @@ pg: enabled: false +maildev: + enabled: false keycloakx: enabled: false contrib: