Updated default ingress from current Driver (#167)

Author: TobiasBabin

resource-definitions/template-driver/ingress/ingress-default.tf

@@ -18,10 +18,16 @@ ingress.yaml:
     kind: Ingress
     metadata:
       {{- if hasKey .driver.values "annotations" }}
-      annotations: {{ .driver.values.annotations | toRawJson }}
+      annotations:
+        {{- range $k, $v := .driver.values.annotations }}
+        {{ $k | toRawJson }}: {{ $v | toRawJson }}
+        {{- end}}
       {{- end}}
       {{- if hasKey .driver.values "labels" }}
-      labels: {{ .driver.values.labels | toRawJson }}
+      labels:
+        {{- range $k, $v := .driver.values.labels }}
+        {{ $k | toRawJson }}: {{ $v | toRawJson }}
+        {{- end}}
       {{- end}}
       name: {{ .id }}-ingress
     spec:

resource-definitions/template-driver/ingress/ingress-default.yaml

@@ -22,10 +22,16 @@ entity:
               kind: Ingress
               metadata:
                 {{- if hasKey .driver.values "annotations" }}
-                annotations: {{ .driver.values.annotations | toRawJson }}
+                annotations:
+                  {{- range $k, $v := .driver.values.annotations }}
+                  {{ $k | toRawJson }}: {{ $v | toRawJson }}
+                  {{- end}}
                 {{- end}}
                 {{- if hasKey .driver.values "labels" }}
-                labels: {{ .driver.values.labels | toRawJson }}
+                labels:
+                  {{- range $k, $v := .driver.values.labels }}
+                  {{ $k | toRawJson }}: {{ $v | toRawJson }}
+                  {{- end}}
                 {{- end}}
                 name: {{ .id }}-ingress
               spec:
@@ -79,4 +85,3 @@ entity:
       # class: nginx
       # labels: {}
       # path_type: Prefix
-