Update Contour Docker image to v1.21.0-rc.1. (#4500)

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
projectcontour · Apr 28, 2022 · dcbe217 · dcbe217
1 parent 39ae16a
commit dcbe217
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 49 deletions.
diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go
@@ -32,7 +32,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, *
 	cmd := app.Command("gateway-provisioner", "Run contour gateway provisioner.")
 
 	config := &gatewayProvisionerConfig{
-		contourImage:          "ghcr.io/projectcontour/contour:main",
+		contourImage:          "ghcr.io/projectcontour/contour:v1.21.0-rc.1",
 		envoyImage:            "docker.io/envoyproxy/envoy:v1.22.0",
 		metricsBindAddress:    ":8080",
 		leaderElection:        false,

diff --git a/examples/contour/02-job-certgen.yaml b/examples/contour/02-job-certgen.yaml
@@ -36,19 +36,18 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-main
+  name: contour-certgen-v1.21.0-rc.1
   namespace: projectcontour
 spec:
-  ttlSecondsAfterFinished: 0
   template:
     metadata:
       labels:
         app: "contour-certgen"
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         command:
         - contour
         - certgen

diff --git a/examples/contour/03-contour.yaml b/examples/contour/03-contour.yaml
@@ -45,8 +45,8 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour
         ports:
         - containerPort: 8001

diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml
@@ -29,8 +29,8 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
             exec:
@@ -113,8 +113,8 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts:
         - name: envoy-config

diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml
@@ -42,8 +42,8 @@ spec:
           args:
             - envoy
             - shutdown-manager
-          image: ghcr.io/projectcontour/contour:main
-          imagePullPolicy: Always
+          image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+          imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
               exec:
@@ -126,8 +126,8 @@ spec:
             - --envoy-key-file=/certs/tls.key
           command:
             - contour
-          image: ghcr.io/projectcontour/contour:main
-          imagePullPolicy: Always
+          image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+          imagePullPolicy: IfNotPresent
           name: envoy-initconfig
           volumeMounts:
             - name: envoy-config

diff --git a/examples/gateway-provisioner/03-gateway-provisioner.yaml b/examples/gateway-provisioner/03-gateway-provisioner.yaml
@@ -22,8 +22,8 @@ spec:
         - --metrics-addr=127.0.0.1:8080
         - --enable-leader-election
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour-gateway-provisioner
         resources:
           requests:

diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml
@@ -4749,19 +4749,18 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-main
+  name: contour-certgen-v1.21.0-rc.1
   namespace: projectcontour
 spec:
-  ttlSecondsAfterFinished: 0
   template:
     metadata:
       labels:
         app: "contour-certgen"
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         command:
         - contour
         - certgen
@@ -5011,8 +5010,8 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour
         ports:
         - containerPort: 8001
@@ -5113,8 +5112,8 @@ spec:
           args:
             - envoy
             - shutdown-manager
-          image: ghcr.io/projectcontour/contour:main
-          imagePullPolicy: Always
+          image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+          imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
               exec:
@@ -5197,8 +5196,8 @@ spec:
             - --envoy-key-file=/certs/tls.key
           command:
             - contour
-          image: ghcr.io/projectcontour/contour:main
-          imagePullPolicy: Always
+          image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+          imagePullPolicy: IfNotPresent
           name: envoy-initconfig
           volumeMounts:
             - name: envoy-config

diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml
@@ -8496,8 +8496,8 @@ spec:
         - --metrics-addr=127.0.0.1:8080
         - --enable-leader-election
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour-gateway-provisioner
         resources:
           requests:

diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml
@@ -4752,19 +4752,18 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-main
+  name: contour-certgen-v1.21.0-rc.1
   namespace: projectcontour
 spec:
-  ttlSecondsAfterFinished: 0
   template:
     metadata:
       labels:
         app: "contour-certgen"
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         command:
         - contour
         - certgen
@@ -5014,8 +5013,8 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour
         ports:
         - containerPort: 8001
@@ -5103,8 +5102,8 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
             exec:
@@ -5187,8 +5186,8 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts:
         - name: envoy-config

diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
@@ -4749,19 +4749,18 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-main
+  name: contour-certgen-v1.21.0-rc.1
   namespace: projectcontour
 spec:
-  ttlSecondsAfterFinished: 0
   template:
     metadata:
       labels:
         app: "contour-certgen"
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         command:
         - contour
         - certgen
@@ -5011,8 +5010,8 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: contour
         ports:
         - containerPort: 8001
@@ -5100,8 +5099,8 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
             exec:
@@ -5184,8 +5183,8 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: ghcr.io/projectcontour/contour:main
-        imagePullPolicy: Always
+        image: ghcr.io/projectcontour/contour:v1.21.0-rc.1
+        imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts:
         - name: envoy-config