[bitnami/contour] Allow extra arguments to be specified, and passed to Contour container (#4790)

* Allow extra arguments to be specified, and passed to Contour container

This is useful for enabling the PROXY protocol by specifying
`--use-proxy-protocol` as an extra arg.

See https://projectcontour.io/guides/proxy-proto/ for more information.

* Update contour README.md

* Use `common.tplvalues.render` to render extra args for Contour

* Contour v3.2.0

bitnami/contour/Chart.yaml

@@ -26,4 +26,4 @@ sources:
   - https://github.com/envoyproxy/envoy
   - https://github.com/bitnami/bitnami-docker-contour
   - https://projectcontour.io
-version: 3.1.0
+version: 3.2.0

bitnami/contour/README.md

@@ -65,6 +65,7 @@ The following tables lists the configurable parameters of the contour chart and
 | `contour.image.tag`                           | Contour image tag                                                                                                                                                                                            | `{TAG_NAME}`                                            |
 | `contour.pullPolicy`                          | Contour image pull policy                                                                                                                                                                                    | `IfNotPresent`                                          |
 | `contour.image.pullSecrets`                   | Specify docker-registry secret names as an array                                                                                                                                                             | `[]` (does not add image pull secrets to deployed pods) |
+| `contour.extraArgs`                           | Extra arguments passed to Contour container                                                                                                                                                                  | `[]`                                                    |
 | `contour.resources.limits`                    | Specify resource limits which the container is not allowed to succeed.                                                                                                                                       | `{}` (does not add resource limits to deployed pods)    |
 | `contour.resources.requests`                  | Specify resource requests which the container needs to spawn.                                                                                                                                                | `{}` (does not add resource limits to deployed pods)    |
 | `contour.installCRDs`                         | Install CustomResourceDefinitions via helm hooks (only helm v2, use `--skip-crds` on Helm 3)                                                                                                                 | `true`                                                  |

bitnami/contour/templates/contour/deployment.yaml

@@ -68,6 +68,9 @@ spec:
             {{- if .Values.ingressClass }}
             - --ingress-class-name={{ .Values.ingressClass }}
             {{- end }}
+            {{- if .Values.contour.extraArgs }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.contour.extraArgs "context" $) | nindent 12 }}
+            {{- end }}
           image: {{ include "common.images.image" ( dict "imageRoot" .Values.contour.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.contour.image.pullPolicy }}
           name: contour

bitnami/contour/values-production.yaml

@@ -148,6 +148,10 @@ contour:
     # pullSecrets:
     #   - myRegistryKeySecretName
 
+  ## Extra arguments passed to Contour container
+  ##
+  extraArgs: []
+
   ## Contour container resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ## ref: https://projectcontour.io/guides/resource-limits/

bitnami/contour/values.yaml

@@ -146,6 +146,10 @@ contour:
     # pullSecrets:
     #   - myRegistryKeySecretName
 
+  ## Extra arguments passed to Contour container
+  ##
+  extraArgs: []
+
   ## Contour container resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ## ref: https://projectcontour.io/guides/resource-limits/