From eff6a4c84d1410c9b60daad873ba1dc062f1fbeb Mon Sep 17 00:00:00 2001 From: Melvin GABALI Date: Mon, 12 Jan 2026 05:33:02 +0100 Subject: [PATCH] update --- apps/applicationset-traefik.yaml | 5 +++++ configs/dev/config.json | 5 +++-- helm/traefik/dev/values.yaml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/applicationset-traefik.yaml b/apps/applicationset-traefik.yaml index c75e643..9c3083d 100644 --- a/apps/applicationset-traefik.yaml +++ b/apps/applicationset-traefik.yaml @@ -41,6 +41,11 @@ spec: helm: valueFiles: - values.yaml + # Injection des valeurs depuis config.json + values: | + traefik: + dashboard: + url: "{{traefik.url}}" destination: # Les variables {{name}} et {{server}} viennent du fichier config.json # (deuxième générateur du merge) diff --git a/configs/dev/config.json b/configs/dev/config.json index 9774b9e..8df8f3b 100644 --- a/configs/dev/config.json +++ b/configs/dev/config.json @@ -4,12 +4,13 @@ "repository": "https://git.gkdomaine.fr/kubernetes/argocd.git", "targetRevision": "main", "helmPath": "helm", + "domain": ".dev.gkdomaine.local", "traefik": { - "url": "traefik.dev.gkdomaine.local" + "url": "traefik{{domain}}" }, "homarr": { - "url": "homarr.dev.gkdomaine.local" + "url": "homarr{{domain}}" } } diff --git a/helm/traefik/dev/values.yaml b/helm/traefik/dev/values.yaml index 7a135aa..f8de7b9 100644 --- a/helm/traefik/dev/values.yaml +++ b/helm/traefik/dev/values.yaml @@ -63,5 +63,6 @@ traefik: # Configuration du dashboard Traefik # Le dashboard est accessible via l'IngressRoute créé dans templates/config.yaml + # L'URL est injectée depuis config.json via l'ApplicationSet (section helm.values) dashboard: - url: traefik.dev.gkdomaine.local + url: "" # Sera remplacé par la variable traefik.url du config.json