Bump to Contour 1.14.2 (#596)

config/contour-operator/operator.yaml

@@ -6102,7 +6102,7 @@ spec:
         - --enable-leader-election
         command:
         - /contour-operator
-        image: docker.io/projectcontour/contour-operator:v1.14.0
+        image: docker.io/projectcontour/contour-operator:v1.14.1
         imagePullPolicy: IfNotPresent
         name: contour-operator
         resources:

config/contour/external.yaml

@@ -160,6 +160,8 @@ data:
     #   Configure the number of additional ingress proxy hops from the
     #   right side of the x-forwarded-for HTTP header to trust.
     #   num-trusted-hops: 0
+    #   Configure the port used to access the Envoy Admin interface.
+    #   admin-port: 9001
     #
     # Configure an optional global rate limit service.
     # rateLimitService:
@@ -1798,7 +1800,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1.14.0
+  name: contour-certgen-v1.14.2
   namespace: contour-external
   labels:
     networking.knative.dev/ingress-provider: contour
@@ -2159,6 +2161,9 @@ spec:
             initialDelaySeconds: 3
             periodSeconds: 10
           name: shutdown-manager
+          volumeMounts:
+            - name: envoy-admin
+              mountPath: /admin
         - args:
             - -c
             - /config/envoy.json
@@ -2167,7 +2172,7 @@ spec:
             - --log-level info
           command:
             - envoy
-          image: docker.io/envoyproxy/envoy:v1.17.1
+          image: docker.io/envoyproxy/envoy:v1.17.4
           imagePullPolicy: IfNotPresent
           name: envoy
           env:
@@ -2203,6 +2208,8 @@ spec:
             - name: envoycert
               mountPath: /certs
               readOnly: true
+            - name: envoy-admin
+              mountPath: /admin
           lifecycle:
             preStop:
               httpGet:
@@ -2240,6 +2247,8 @@ spec:
       serviceAccountName: envoy
       terminationGracePeriodSeconds: 300
       volumes:
+        - name: envoy-admin
+          emptyDir: {}
         - name: envoy-config
           emptyDir: {}
         - name: envoycert

config/contour/internal.yaml

@@ -160,6 +160,8 @@ data:
     #   Configure the number of additional ingress proxy hops from the
     #   right side of the x-forwarded-for HTTP header to trust.
     #   num-trusted-hops: 0
+    #   Configure the port used to access the Envoy Admin interface.
+    #   admin-port: 9001
     #
     # Configure an optional global rate limit service.
     # rateLimitService:
@@ -1798,7 +1800,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1.14.0
+  name: contour-certgen-v1.14.2
   namespace: contour-internal
   labels:
     networking.knative.dev/ingress-provider: contour
@@ -2159,6 +2161,9 @@ spec:
             initialDelaySeconds: 3
             periodSeconds: 10
           name: shutdown-manager
+          volumeMounts:
+            - name: envoy-admin
+              mountPath: /admin
         - args:
             - -c
             - /config/envoy.json
@@ -2167,7 +2172,7 @@ spec:
             - --log-level info
           command:
             - envoy
-          image: docker.io/envoyproxy/envoy:v1.17.1
+          image: docker.io/envoyproxy/envoy:v1.17.4
           imagePullPolicy: IfNotPresent
           name: envoy
           env:
@@ -2203,6 +2208,8 @@ spec:
             - name: envoycert
               mountPath: /certs
               readOnly: true
+            - name: envoy-admin
+              mountPath: /admin
           lifecycle:
             preStop:
               httpGet:
@@ -2240,6 +2247,8 @@ spec:
       serviceAccountName: envoy
       terminationGracePeriodSeconds: 300
       volumes:
+        - name: envoy-admin
+          emptyDir: {}
         - name: envoy-config
           emptyDir: {}
         - name: envoycert

go.mod

@@ -5,7 +5,7 @@ go 1.15
 require (
 	github.com/google/go-cmp v0.5.6
 	github.com/mikefarah/yq/v3 v3.0.0-20200601230220-721dd57ed41b
-	github.com/projectcontour/contour v1.14.0
+	github.com/projectcontour/contour v1.14.2
 	go.uber.org/zap v1.17.0
 	k8s.io/api v0.20.7
 	k8s.io/apimachinery v0.20.7

go.sum

@@ -592,8 +592,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-github.com/projectcontour/contour v1.14.0 h1:xfMjzI3HuWecfe85qdBluqFRWvTtQuKVK2seZuSTx9E=
-github.com/projectcontour/contour v1.14.0/go.mod h1:IrlEYL0KQvvsEw0ZWg+8P21P1OuVLqnAxIMGwkLljJI=
+github.com/projectcontour/contour v1.14.2 h1:5tLSg/Bs/n8Mhb81hLMMm9OAoE4gZjfvIV2aEMj2HkQ=
+github.com/projectcontour/contour v1.14.2/go.mod h1:IrlEYL0KQvvsEw0ZWg+8P21P1OuVLqnAxIMGwkLljJI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=

hack/update-deps.sh

@@ -20,8 +20,8 @@ set -o pipefail
 
 source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
 
-CONTOUR_VERSION="v1.14.0" # This is for controlling which version of contour we want to use.
-CONTOUR_OPERATOR_VERSION="v1.14.0" # This is for controlling which version of contour-operator we want to use.
+CONTOUR_VERSION="v1.14.2" # This is for controlling which version of contour we want to use.
+CONTOUR_OPERATOR_VERSION="v1.14.1" # This is for controlling which version of contour-operator we want to use.
 
 CLUSTER_ROLE_NAME=knative-contour