[bitnami/contour] Sync upstream changes and chart standardization

bitnami/contour/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: contour
 description: Contour Ingress controller for Kubernetes
-version: 1.2.0
+version: 1.2.1
 appVersion: 1.7.0
 keywords:
   - ingress

bitnami/contour/README.md

@@ -173,6 +173,12 @@ configInline:
   tls:
   #   minimum TLS version that Contour will negotiate
   #   minimum-protocol-version: "1.1"
+  # Defines the Kubernetes name/namespace matching a secret to use
+  # as the fallback certificate when requests which don't match the
+  # SNI defined for a vhost.
+    fallback-certificate:
+  #   name: fallback-secret-name
+  #   namespace: projectcontour
   # The following config shows the defaults for the leader election.
   # leaderelection:
   #   configmap-name: leader-elect
@@ -208,6 +214,18 @@ configInline:
   #   - "upstream_service_time"
   #   - "user_agent"
   #   - "x_forwarded_for"
+  #
+  # default-http-versions:
+  # - "HTTP/2"
+  # - "HTTP/1.1"
+  #
+  # The following shows the default proxy timeout settings.
+  # timeouts:
+  #   request-timeout: infinity
+  #   connection-idle-timeout: 60s
+  #   stream-idle-timeout: 5m
+  #   max-connection-duration: infinity
+  #   connection-shutdown-grace-period: 5s
 ```
 
 ### Deploying Contour with an AWS NLB

bitnami/contour/templates/daemonset.yaml

@@ -52,10 +52,11 @@ spec:
         imagePullPolicy: {{ .Values.contour.image.pullPolicy }}
         lifecycle:
           preStop:
-            httpGet:
-              path: /shutdown
-              port: 8090
-              scheme: HTTP
+            exec:
+              command:
+                - contour
+                - envoy
+                - shutdown
         {{- if .Values.contour.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
@@ -150,6 +151,7 @@ spec:
         - /config/envoy.json
         - --xds-address={{ template "contour.fullname" . }}
         - --xds-port=8001
+        - --resources-dir=/config/resources
         - --envoy-cafile=/certs/ca.crt
         - --envoy-cert-file=/certs/tls.crt
         - --envoy-key-file=/certs/tls.key
@@ -169,6 +171,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+      automountServiceAccountToken: false
       serviceAccountName: {{ include "envoy.envoyServiceAccountName" . }}
       volumes:
       - name: envoy-config

bitnami/contour/templates/deployment.yaml

@@ -105,6 +105,11 @@ spec:
           mountPath: /config
           readOnly: true
         env:
+        - name: CONTOUR_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
         - name: POD_NAME
           valueFrom:
             fieldRef:

bitnami/contour/values-production.yaml

@@ -47,6 +47,12 @@ configInline:
   tls:
   #   minimum TLS version that Contour will negotiate
   #   minimum-protocol-version: "1.1"
+  # Defines the Kubernetes name/namespace matching a secret to use
+  # as the fallback certificate when requests which don't match the
+  # SNI defined for a vhost.
+    fallback-certificate:
+  #   name: fallback-secret-name
+  #   namespace: '{{ .Release.Namespace }}'
   # The following config shows the defaults for the leader election.
   ## This needs to be edited by when you deploy to a namespace other than projectcontour
   ##
@@ -84,6 +90,18 @@ configInline:
   #   - "upstream_service_time"
   #   - "user_agent"
   #   - "x_forwarded_for"
+  #
+  # default-http-versions:
+  # - "HTTP/2"
+  # - "HTTP/1.1"
+  #
+  # The following shows the default proxy timeout settings.
+  # timeouts:
+  #   request-timeout: infinity
+  #   connection-idle-timeout: 60s
+  #   stream-idle-timeout: 5m
+  #   max-connection-duration: infinity
+  #   connection-shutdown-grace-period: 5s
 
 ## Name of the ingress class to route through this controller
 ##

bitnami/contour/values.yaml

@@ -46,6 +46,12 @@ configInline:
   tls:
   #   minimum TLS version that Contour will negotiate
   #   minimum-protocol-version: "1.1"
+  # Defines the Kubernetes name/namespace matching a secret to use
+  # as the fallback certificate when requests which don't match the
+  # SNI defined for a vhost.
+    fallback-certificate:
+  #   name: fallback-secret-name
+  #   namespace: '{{ .Release.Namespace }}'
   # The following config shows the defaults for the leader election.
   ## This needs to be edited by when you deploy to a namespace other than projectcontour
   leaderelection:
@@ -82,6 +88,18 @@ configInline:
   #   - "upstream_service_time"
   #   - "user_agent"
   #   - "x_forwarded_for"
+  #
+  # default-http-versions:
+  # - "HTTP/2"
+  # - "HTTP/1.1"
+  #
+  # The following shows the default proxy timeout settings.
+  # timeouts:
+  #   request-timeout: infinity
+  #   connection-idle-timeout: 60s
+  #   stream-idle-timeout: 5m
+  #   max-connection-duration: infinity
+  #   connection-shutdown-grace-period: 5s
 
 ## Name of the ingress class to route through this controller
 ##