[FIX] two annotations for two ingress (#17)

orb-community · Apr 22, 2022 · d6c019d · d6c019d
1 parent 6043ef2
commit d6c019d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/charts/orb/templates/ingress.yaml b/charts/orb/templates/ingress.yaml
@@ -4,9 +4,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-{{- if .Values.ingress.annotations }}
+{{- if .Values.ingress.annotations-nginx }}
   annotations:
-{{ toYaml .Values.ingress.annotations | indent 4 }}
+{{ toYaml .Values.ingress.annotations-nginx | indent 4 }}
 {{- end }}
   name: {{ .Release.Name }}-nginx-ingress
 spec:
@@ -37,9 +37,9 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-{{- if .Values.ingress.annotations }}
+{{- if .Values.ingress.annotations-nginx-rewrite }}
   annotations:
-{{ toYaml .Values.ingress.annotations | indent 4 }}
+{{ toYaml .Values.ingress.annotations-nginx-rewrite | indent 4 }}
 {{- end }}
   name: {{ .Release.Name }}-nginx-rewrite-ingress
 spec:

diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml
@@ -26,7 +26,9 @@ smtp:
 
 ingress:
   ingressClassName: "nginx"
-  annotations:
+  annotations-nginx:
+    cert-manager.io/issuer: "letsencrypt-prod"
+  annotations-nginx-rewrite:
     cert-manager.io/issuer: "letsencrypt-prod"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
   hostname: ""