[bitnami/contour] Add ability to specify ingressClass and restart pods on config change

bitnami/contour/Chart.yaml

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

bitnami/contour/README.md

@@ -109,11 +109,22 @@ The following tables lists the configurable parameters of the contour chart and
 | `envoy.readynessProbe.timeoutSeconds`              | When the probe times out                                                                               | `1`                                                     |
 | `envoy.readynessProbe.successThreshold`            | Minimum consecutive successes for the probe to be considered successful after having failed.           | `3`                                                     |
 | `envoy.readynessProbe.failureThreshold`            | Minimum consecutive failures for the probe to be considered failed after having succeeded.             | `1`                                                     |
+| `envoy.service.type`                               | Type of envoy service to create                                                                        | `LoadBalancer`                                          |
+| `envoy.service.externalTrafficPolicy`              | If `envoy.service.type` is NodePort or LoadBalancer, set this to Local to enable [source IP preservation](https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typenodeport) | `Local` |
+| `envoy.service.clusterIP`                          | Internal envoy cluster service IP                                                                      | `""`                                                    |
+| `envoy.service.externalIPs`                        | Envoy service external IP addresses.                                                                   | `[]`                                                    |
+| `envoy.service.loadBalancerIP`                     | IP address to assign to load balancer (if supported)                                                   | `""`                                                    |
+| `envoy.service.loadBalancerSourceRanges`           | List of IP CIDRs allowed access to load balancer (if supported)                                        | `[]`                                                    |
+| `envoy.service.annotations`                        | Annotations for envoy service                                                                          | `{}`                                                    |
+| `envoy.service.ports.http`                         | Sets service http port                                                                                 | `80`                                                    |
+| `envoy.service.ports.https`                        | Sets service https port                                                                                | `443`                                                   |
+| `envoy.service.nodePorts.http`                     | If `envoy.service.type` is NodePort and this is non-empty, it sets the nodePort that maps to envoys http port  | `""`                                            |
+| `envoy.service.nodePorts.https`                    | If `envoy.service.type` is NodePort and this is non-empty, it sets the nodePort that maps to envoys https port | `""`                                            |
 | `existingConfigMap`                                | Specify an existing configMapName to use. (this mutually exclusive with existingConfigMap)             | `nil`                                                   |
 | `configInline`                                     | Specify the config for contour as a new configMap inline.                                              | `{Quickstart Config}` (evaluated as a template)         |
+| `ingressClass`                                     | Name of the ingress class to route through this controller (defaults to `contour` if `nil`)            | `nil`                                                   |
 | `nameOverride`                                     | String to partially override contour.fullname template with a string (will prepend the release name)   | `nil`                                                   |
 | `fullnameOverride`                                 | String to fully override contour.fullname template with a string                                       | `nil`                                                   |
-| `rbac.create`                                      | Specify if an rbac authorization should be created with the necessarry Rolebindings.                   | `true`                                                  |
 | `prometheus.serviceMonitor.enabled`                | Specify if a servicemonitor will be deployed for prometheus-operator.                                  | `true`                                                  |
 | `prometheus.serviceMonitor.jobLabel`               | Specify the jobLabel to use for the prometheus-operator                                                | `contour`                                               |
 | `prometheus.serviceMonitor.interval`               | Specify the scrape interval if not specified use defaul prometheus scrapeIntervall                     | `""`                                                    |

bitnami/contour/templates/deployment.yaml

@@ -19,6 +19,10 @@ spec:
       app.kubernetes.io/component: contour
   template:
     metadata:
+      {{- if .Values.configInline }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      {{- end }}
       labels: {{- include "contour.labels" . | nindent 8 }}
         app.kubernetes.io/component: contour
     spec: {{- include "contour.imagePullSecrets" . | nindent 6 }}
@@ -57,6 +61,9 @@ spec:
         - --contour-cert-file=/certs/tls.crt
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
+        {{- if .Values.ingressClass }}
+        - --ingress-class-name={{ .Values.ingressClass }}
+        {{- end }}
         image: {{ include "contour.image" . }}
         imagePullPolicy: {{ .Values.contour.image.pullPolicy }}
         name: contour

bitnami/contour/values-production.yaml

@@ -85,6 +85,10 @@ configInline:
   #   - "user_agent"
   #   - "x_forwarded_for"
 
+## Name of the ingress class to route through this controller
+##
+# ingressClass: contour
+
 ## String to partially override contour.fullname include (will maintain the release name)
 ##
 # nameOverride:
@@ -314,6 +318,10 @@ envoy:
     ##
     type: LoadBalancer
     externalTrafficPolicy: Local
+    # clusterIP: ""
+    # externalIPs: []
+    # loadBalancerIP: ""
+    # loadBalancerSourceRanges: []
 
     ## Service annotations
     ##

bitnami/contour/values.yaml

@@ -83,6 +83,10 @@ configInline:
   #   - "user_agent"
   #   - "x_forwarded_for"
 
+## Name of the ingress class to route through this controller
+##
+# ingressClass: contour
+
 ## String to partially override contour.fullname include (will maintain the release name)
 ##
 # nameOverride:
@@ -309,6 +313,10 @@ envoy:
     ##
     type: LoadBalancer
     externalTrafficPolicy: Local
+    # clusterIP: ""
+    # externalIPs: []
+    # loadBalancerIP: ""
+    # loadBalancerSourceRanges: []
 
     ## Service annotations
     ##