argocd, nexus and vault ingress annotations combined to the global in…

…gress rules
cloud-pi-native · Oct 21, 2024 · 3418c19 · 3418c19
1 parent bf029de
commit 3418c19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/roles/argocd/templates/ingress.yaml.j2 b/roles/argocd/templates/ingress.yaml.j2
@@ -4,7 +4,7 @@ metadata:
   name: argo-ingress
   namespace: {{ dsc.argocd.namespace }}
   annotations:
-{% for key, val in dsc.ingress.annotations.items() %}
+{% for key, val in (dsc.ingress.annotations | combine(dsc.argocd['values'].server.ingress.annotations | default([]))).items() %}
     {{ key }}: {{ val }}
 {% endfor %}
   labels:

diff --git a/roles/nexus/templates/ingress.yml.j2 b/roles/nexus/templates/ingress.yml.j2
@@ -5,7 +5,7 @@ metadata:
   name: nexus-alternative
   namespace: {{ dsc.nexus.namespace }}
   annotations:
-{% for key, val in dsc.ingress.annotations.items() %}
+{% for key, val in (dsc.ingress.annotations | combine(dsc.nexus['values'].server.ingress.annotations | default([]))).items() %}
     {{ key }}: {{ val }}
 {% endfor %}
   labels:

diff --git a/roles/vault/templates/ingress.yaml.j2 b/roles/vault/templates/ingress.yaml.j2
@@ -4,7 +4,7 @@ metadata:
   name: vault-ingress
   namespace: {{ dsc.vault.namespace }}
   annotations:
-{% for key, val in dsc.ingress.annotations.items() %}
+{% for key, val in (dsc.ingress.annotations | combine(dsc.vault['values'].server.ingress.annotations | default([]))).items() %}
     {{ key }}: {{ val }}
 {% endfor %}
   labels:
@@ -32,6 +32,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ dsc_name }}-vault-active
+                name: {{ dsc_name }}-vault
                 port:
                   number: 8200