Merge pull request #92 from vramperez/fix/did-ingress-annotations

fix(did): add support for didJson and didKey ingress annotations

Author: wistefan

charts/data-space-connector/templates/did-ingress.yaml

@@ -4,31 +4,10 @@ kind: Ingress
 metadata:
   name: did-json
   namespace: {{ $.Release.Namespace | quote }}
+{{- if .Values.didJson.ingress.annotations }}
   annotations:
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/service.passhostheader: "true"
-  labels:
-    {{ include "dsc.labels" . | nindent 4 }}
-spec:
-  rules:
-    - host: {{ .Values.didJson.ingress.host }}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: did-json
-                port:
-                  name: http
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: did-json-unsecured
-  namespace: {{ $.Release.Namespace | quote }}
-  annotations:
-    traefik.ingress.kubernetes.io/service.passhostheader: "true"
+{{- toYaml .Values.didJson.ingress.annotations | nindent 4 }}
+{{- end }}
   labels:
     {{ include "dsc.labels" . | nindent 4 }}
 spec:

charts/data-space-connector/templates/did-key-ingress.yaml

@@ -6,6 +6,10 @@ metadata:
   namespace: {{ $.Release.Namespace | quote }}
   labels:
     {{ include "dsc.labels" . | nindent 4 }}
+{{- if .Values.did.ingress.annotations }}
+  annotations:
+{{- toYaml .Values.did.ingress.annotations | nindent 4 }}
+{{- end }}
 spec:
   rules:
     - host: {{ .Values.did.ingress.host }}