From 0893c3531ed5a0e1562e5b3d957ab4fc74448916 Mon Sep 17 00:00:00 2001
From: Steve Sloka <slokas@vmware.com>
Date: Wed, 30 Sep 2020 14:58:38 -0400
Subject: [PATCH] Release v1.8.2 onto branch release-1.8 (#2959)

* Update Contour Docker image to v1.8.2.

Signed-off-by: Steve Sloka <slokas@vmware.com>

* release; Update Envoy image to v1.15.1 releasing Contour v1.8.2

Signed-off-by: Steve Sloka <slokas@vmware.com>
---
 examples/contour/02-job-certgen.yaml |  8 ++------
 examples/contour/03-contour.yaml     |  2 +-
 examples/contour/03-envoy.yaml       |  6 +++---
 examples/render/contour.yaml         | 16 ++++++----------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/examples/contour/02-job-certgen.yaml b/examples/contour/02-job-certgen.yaml
index c3fb5835752..fb4313eaa46 100644
--- a/examples/contour/02-job-certgen.yaml
+++ b/examples/contour/02-job-certgen.yaml
@@ -36,7 +36,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1.8.1
+  name: contour-certgen-v1.8.2
   namespace: projectcontour
 spec:
   ttlSecondsAfterFinished: 0
@@ -47,11 +47,7 @@ spec:
     spec:
       containers:
       - name: contour
-        # This version is set to latest because Job specs are immutable;
-        # if we change this on each version, you can no longer upgrade
-        # just by applying the deployment YAML.
-        # See #2423, #2395, #2150, and #2030 for earlier questions about this.
-        image: docker.io/projectcontour/contour:latest
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: Always
         command:
         - contour
diff --git a/examples/contour/03-contour.yaml b/examples/contour/03-contour.yaml
index 00603941e71..aa0648d2eca 100644
--- a/examples/contour/03-contour.yaml
+++ b/examples/contour/03-contour.yaml
@@ -47,7 +47,7 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: Always
         name: contour
         ports:
diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml
index 6f09768e367..1142e919ba1 100644
--- a/examples/contour/03-envoy.yaml
+++ b/examples/contour/03-envoy.yaml
@@ -29,7 +29,7 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: Always
         lifecycle:
           preStop:
@@ -53,7 +53,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.15.0
+        image: docker.io/envoyproxy/envoy:v1.15.1
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
@@ -105,7 +105,7 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: Always
         name: envoy-initconfig
         volumeMounts:
diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
index 8b1d6b47bcd..0ea1b47ddf8 100644
--- a/examples/render/contour.yaml
+++ b/examples/render/contour.yaml
@@ -1451,7 +1451,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1.8.1
+  name: contour-certgen-v1.8.2
   namespace: projectcontour
 spec:
   ttlSecondsAfterFinished: 0
@@ -1462,11 +1462,7 @@ spec:
     spec:
       containers:
       - name: contour
-        # This version is set to latest because Job specs are immutable;
-        # if we change this on each version, you can no longer upgrade
-        # just by applying the deployment YAML.
-        # See #2423, #2395, #2150, and #2030 for earlier questions about this.
-        image: docker.io/projectcontour/contour:latest
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: Always
         command:
         - contour
@@ -1686,7 +1682,7 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: IfNotPresent
         name: contour
         ports:
@@ -1772,7 +1768,7 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -1796,7 +1792,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.15.0
+        image: docker.io/envoyproxy/envoy:v1.15.1
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
@@ -1848,7 +1844,7 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: docker.io/projectcontour/contour:v1.8.1
+        image: docker.io/projectcontour/contour:v1.8.2
         imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts: