feat(helm): allow extraArgs to also be a map enabling overrides of individual values

With external-dns relying a lot on `extraArgs` for its configuration using a map (key: value)
data structure for extraArgs enables a lot more versatility.
Multiple values files can be used to e.g. configure common values in one and then only specific
values in another. Also setting certain values via `--set` is then possible.

Author: frittentheke

charts/external-dns/README.md

@@ -104,7 +104,7 @@ If `namespaced` is set to `true`, please ensure that `sources` my only contains
 | enabled | bool | `nil` | No effect - reserved for use in sub-charting. |
 | env | list | `[]` | [Environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) for the `external-dns` container. |
 | excludeDomains | list | `[]` | Intentionally exclude domains from being managed. |
-| extraArgs | list | `[]` | Extra arguments to provide to _ExternalDNS_. |
+| extraArgs | object | `{}` | Extra arguments to provide to _ExternalDNS_. An array or map can be used with maps allowing for value overrides and merging via multiple value files or --set |
 | extraContainers | object | `{}` | Extra containers to add to the `Deployment`. |
 | extraVolumeMounts | list | `[]` | Extra [volume mounts](https://kubernetes.io/docs/concepts/storage/volumes/) for the `external-dns` container. |
 | extraVolumes | list | `[]` | Extra [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) for the `Pod`. |

charts/external-dns/templates/deployment.yaml

@@ -124,9 +124,26 @@ spec:
             - --managed-record-types={{ . }}
             {{- end }}
             - --provider={{ $providerName }}
-          {{- range .Values.extraArgs }}
+            {{- if kindIs "map" .Values.extraArgs }}
+            {{- range $key, $value := .Values.extraArgs }}
+            {{- if not (kindIs "invalid" $value) }}
+            {{- if kindIs "slice" $value }}
+            {{- range $value }}
+            - --{{ $key }}={{ tpl (. | toString) $ }}
+            {{- end }}
+            {{- else }}
+            - --{{ $key }}={{ tpl ($value | toString) $ }}
+            {{- end }}
+            {{- else }}
+            - --{{ $key }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- if kindIs "slice" .Values.extraArgs }}
+            {{- range .Values.extraArgs }}
             - {{ tpl . $ }}
-          {{- end }}
+            {{- end }}
+            {{- end }}
           ports:
             - name: http
               protocol: TCP

charts/external-dns/tests/deployment-flags_test.yaml

@@ -103,10 +103,65 @@ tests:
             - --zone-id-filter=/hostedzone/Z00004
             - --zone-id-filter=/hostedzone/Z00005
 
+
+  - it: should allow 'extraArgs' to be a slice
+    set:
+      extraArgs:
+       - --extraArgA=valueA
+       - --extraArgB=valueB
+       - --extraArgC=valueC-1
+       - --extraArgC=valueC-2
+
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name == "external-dns")].args
+          value:
+            - --log-level=info
+            - --log-format=text
+            - --interval=1m
+            - --source=service
+            - --source=ingress
+            - --policy=upsert-only
+            - --registry=txt
+            - --provider=aws
+            - --extraArgA=valueA
+            - --extraArgB=valueB
+            - --extraArgC=valueC-1
+            - --extraArgC=valueC-2
+
+
+  - it: should allow 'extraArgs' to be a map with its entries potentially being slices (lists) themselves
+    set:
+      extraArgs:
+        extraArgA: valueA
+        extraArgB: valueB
+        extraArgC:
+          - valueC-1
+          - valueC-2
+
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name == "external-dns")].args
+          value:
+            - --log-level=info
+            - --log-format=text
+            - --interval=1m
+            - --source=service
+            - --source=ingress
+            - --policy=upsert-only
+            - --registry=txt
+            - --provider=aws
+            - --extraArgA=valueA
+            - --extraArgB=valueB
+            - --extraArgC=valueC-1
+            - --extraArgC=valueC-2
+
+
   - it: should throw error when txtPrefix and txtSuffix are set
     set:
         txtPrefix: "test-prefix"
         txtSuffix: "test-suffix"
     asserts:
      - failedTemplate:
           errorMessage: "'txtPrefix' and 'txtSuffix' are mutually exclusive"
+

charts/external-dns/values.schema.json

@@ -64,9 +64,11 @@
       "items": {
         "type": "string"
       },
+      "properties": {},
       "type": [
         "array",
-        "null"
+        "null",
+        "object"
       ],
       "uniqueItems": true
     },

charts/external-dns/values.yaml

@@ -296,7 +296,8 @@ provider:  # @schema type: [object, string];
       relabelings: []
 
 # -- Extra arguments to provide to _ExternalDNS_.
-extraArgs: []  # @schema type: [array, null]; item: string; uniqueItems: true;
+# An array or map can be used, with maps allowing for value overrides; maps also support slice values to use the same arg multiple times.
+extraArgs: {}  # @schema type: [array, null, object]; item: string; uniqueItems: true;
 
 secretConfiguration:
   # -- If `true`, create a `Secret` to store sensitive provider configuration (**DEPRECATED**).