diff --git a/configs/dev/config.json b/configs/dev/config.json index d3df596..9774b9e 100644 --- a/configs/dev/config.json +++ b/configs/dev/config.json @@ -4,19 +4,11 @@ "repository": "https://git.gkdomaine.fr/kubernetes/argocd.git", "targetRevision": "main", "helmPath": "helm", - - "harbor": { - "repository": "harbor.gkdomaine.local" - }, "traefik": { "url": "traefik.dev.gkdomaine.local" }, - "metallb": { - "ipAddressPool": "10.78.106.240-10.78.106.245" - }, - "homarr": { "url": "homarr.dev.gkdomaine.local" } diff --git a/helm/metallb/dev/templates/config.yaml b/helm/metallb/dev/templates/config.yaml index b58668d..84741f1 100644 --- a/helm/metallb/dev/templates/config.yaml +++ b/helm/metallb/dev/templates/config.yaml @@ -5,7 +5,7 @@ metadata: namespace: {{ .Release.Namespace }} spec: addresses: - - {{ .Values.metallb.ipAddressPool }} + - {{ .Values.ipAddressPool | quote }} --- apiVersion: metallb.io/v1beta1 kind: L2Advertisement diff --git a/helm/metallb/dev/values.yaml b/helm/metallb/dev/values.yaml index 16de90d..a0d0bc9 100644 --- a/helm/metallb/dev/values.yaml +++ b/helm/metallb/dev/values.yaml @@ -1,20 +1,24 @@ -# Toutes les configurations destinées au chart Nextcloud -# doivent être indentées sous la clé 'nextcloud' +# Configuration pour le chart wrapper MetalLB +# Les valeurs doivent être sous la clé 'metallb' pour être passées au chart dépendant metallb: controller: enabled: true image: - repository: "{{ .Values.harbor.repository }}/images/controller" + repository: harbor.gkdomaine.local/images/controller tag: v0.15.3 pullPolicy: IfNotPresent speaker: enabled: true image: - repository: "{{ .Values.harbor.repository }}/images/speaker" + repository: harbor.gkdomaine.local/images/speaker tag: v0.15.3 pullPolicy: IfNotPresent frr: enabled: true image: - repository: "{{ .Values.harbor.repository }}/images/frr" - tag: 10.4.1 \ No newline at end of file + repository: harbor.gkdomaine.local/images/frr + tag: 10.4.1 + +# Configuration spécifique au wrapper (non passée au chart metallb) +# Pool d'adresses IP pour MetalLB +ipAddressPool: "10.78.106.240-10.78.106.245" \ No newline at end of file