fix: ♻️ improve customization for ingress annotations

cloud-pi-native · Oct 28, 2024 · d15fc30 · d15fc30
1 parent ed36a06
commit d15fc30
Show file tree

Hide file tree

Showing 4 changed files with 9 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.ingressAnnotations | default([]))).items() %}
     {{ key }}: {{ val }}
 {% endfor %}
   labels:

diff --git a/roles/socle-config/files/crd-conf-dso.yaml b/roles/socle-config/files/crd-conf-dso.yaml
@@ -1018,6 +1018,11 @@ spec:
                     imageTag:
                       description: Nexus version based on image tag (e.g., "3.56.0").
                       type: string
+                    ingressAnnotations:
+                      description: |
+                        You can put here custom annotations for nexus ingress, they will be pushed into the nexus ingress rule combined to `dsc.ingress.annotations`
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
                   type: object
                 prometheus:
                   description: Minimal configuration for prometheus CRDs

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{% if dsc.vault['values'].server.ha.enabled | default(true) %}-active{% endif +%}
                 port:
                   number: 8200