Skip to content

Commit 62997e6

Browse files
skrissskriss
committed
Update Contour Docker image to v1.26.0-rc.1.
Signed-off-by: Steve Kriss <[email protected]>
1 parent ff2abce commit 62997e6

10 files changed

+45
-49
lines changed

‎cmd/contour/gatewayprovisioner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, *
3333
cmd := app.Command("gateway-provisioner", "Run contour gateway provisioner.")
3434

3535
provisionerConfig := &gatewayProvisionerConfig{
36-
contourImage: "ghcr.io/projectcontour/contour:main",
36+
contourImage: "ghcr.io/projectcontour/contour:v1.26.0-rc.1",
3737
envoyImage: "docker.io/envoyproxy/envoy:v1.27.0",
3838
metricsBindAddress: ":8080",
3939
leaderElection: false,

‎examples/contour/02-job-certgen.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,18 @@ rules:
3636
apiVersion: batch/v1
3737
kind: Job
3838
metadata:
39-
name: contour-certgen-main
39+
name: contour-certgen-v1-26-0-rc-1
4040
namespace: projectcontour
4141
spec:
42-
ttlSecondsAfterFinished: 0
4342
template:
4443
metadata:
4544
labels:
4645
app: "contour-certgen"
4746
spec:
4847
containers:
4948
- name: contour
50-
image: ghcr.io/projectcontour/contour:main
51-
imagePullPolicy: Always
49+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
50+
imagePullPolicy: IfNotPresent
5251
command:
5352
- contour
5453
- certgen

‎examples/contour/03-contour.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ spec:
4545
- --contour-key-file=/certs/tls.key
4646
- --config-path=/config/contour.yaml
4747
command: ["contour"]
48-
image: ghcr.io/projectcontour/contour:main
49-
imagePullPolicy: Always
48+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
49+
imagePullPolicy: IfNotPresent
5050
name: contour
5151
ports:
5252
- containerPort: 8001

‎examples/contour/03-envoy.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ spec:
2929
args:
3030
- envoy
3131
- shutdown-manager
32-
image: ghcr.io/projectcontour/contour:main
33-
imagePullPolicy: Always
32+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
33+
imagePullPolicy: IfNotPresent
3434
lifecycle:
3535
preStop:
3636
exec:
@@ -107,8 +107,8 @@ spec:
107107
- --envoy-key-file=/certs/tls.key
108108
command:
109109
- contour
110-
image: ghcr.io/projectcontour/contour:main
111-
imagePullPolicy: Always
110+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
111+
imagePullPolicy: IfNotPresent
112112
name: envoy-initconfig
113113
volumeMounts:
114114
- name: envoy-config

‎examples/deployment/03-envoy-deployment.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ spec:
4242
args:
4343
- envoy
4444
- shutdown-manager
45-
image: ghcr.io/projectcontour/contour:main
46-
imagePullPolicy: Always
45+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
46+
imagePullPolicy: IfNotPresent
4747
lifecycle:
4848
preStop:
4949
exec:
@@ -120,8 +120,8 @@ spec:
120120
- --envoy-key-file=/certs/tls.key
121121
command:
122122
- contour
123-
image: ghcr.io/projectcontour/contour:main
124-
imagePullPolicy: Always
123+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
124+
imagePullPolicy: IfNotPresent
125125
name: envoy-initconfig
126126
volumeMounts:
127127
- name: envoy-config

‎examples/gateway-provisioner/03-gateway-provisioner.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ spec:
2222
- --metrics-addr=127.0.0.1:8080
2323
- --enable-leader-election
2424
command: ["contour"]
25-
image: ghcr.io/projectcontour/contour:main
26-
imagePullPolicy: Always
25+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
26+
imagePullPolicy: IfNotPresent
2727
name: contour-gateway-provisioner
2828
resources:
2929
requests:

‎examples/render/contour-deployment.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8205,19 +8205,18 @@ rules:
82058205
apiVersion: batch/v1
82068206
kind: Job
82078207
metadata:
8208-
name: contour-certgen-main
8208+
name: contour-certgen-v1-26-0-rc-1
82098209
namespace: projectcontour
82108210
spec:
8211-
ttlSecondsAfterFinished: 0
82128211
template:
82138212
metadata:
82148213
labels:
82158214
app: "contour-certgen"
82168215
spec:
82178216
containers:
82188217
- name: contour
8219-
image: ghcr.io/projectcontour/contour:main
8220-
imagePullPolicy: Always
8218+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8219+
imagePullPolicy: IfNotPresent
82218220
command:
82228221
- contour
82238222
- certgen
@@ -8467,8 +8466,8 @@ spec:
84678466
- --contour-key-file=/certs/tls.key
84688467
- --config-path=/config/contour.yaml
84698468
command: ["contour"]
8470-
image: ghcr.io/projectcontour/contour:main
8471-
imagePullPolicy: Always
8469+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8470+
imagePullPolicy: IfNotPresent
84728471
name: contour
84738472
ports:
84748473
- containerPort: 8001
@@ -8569,8 +8568,8 @@ spec:
85698568
args:
85708569
- envoy
85718570
- shutdown-manager
8572-
image: ghcr.io/projectcontour/contour:main
8573-
imagePullPolicy: Always
8571+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8572+
imagePullPolicy: IfNotPresent
85748573
lifecycle:
85758574
preStop:
85768575
exec:
@@ -8647,8 +8646,8 @@ spec:
86478646
- --envoy-key-file=/certs/tls.key
86488647
command:
86498648
- contour
8650-
image: ghcr.io/projectcontour/contour:main
8651-
imagePullPolicy: Always
8649+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8650+
imagePullPolicy: IfNotPresent
86528651
name: envoy-initconfig
86538652
volumeMounts:
86548653
- name: envoy-config

‎examples/render/contour-gateway-provisioner.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17622,8 +17622,8 @@ spec:
1762217622
- --metrics-addr=127.0.0.1:8080
1762317623
- --enable-leader-election
1762417624
command: ["contour"]
17625-
image: ghcr.io/projectcontour/contour:main
17626-
imagePullPolicy: Always
17625+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
17626+
imagePullPolicy: IfNotPresent
1762717627
name: contour-gateway-provisioner
1762817628
resources:
1762917629
requests:

‎examples/render/contour-gateway.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8211,19 +8211,18 @@ rules:
82118211
apiVersion: batch/v1
82128212
kind: Job
82138213
metadata:
8214-
name: contour-certgen-main
8214+
name: contour-certgen-v1-26-0-rc-1
82158215
namespace: projectcontour
82168216
spec:
8217-
ttlSecondsAfterFinished: 0
82188217
template:
82198218
metadata:
82208219
labels:
82218220
app: "contour-certgen"
82228221
spec:
82238222
containers:
82248223
- name: contour
8225-
image: ghcr.io/projectcontour/contour:main
8226-
imagePullPolicy: Always
8224+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8225+
imagePullPolicy: IfNotPresent
82278226
command:
82288227
- contour
82298228
- certgen
@@ -8473,8 +8472,8 @@ spec:
84738472
- --contour-key-file=/certs/tls.key
84748473
- --config-path=/config/contour.yaml
84758474
command: ["contour"]
8476-
image: ghcr.io/projectcontour/contour:main
8477-
imagePullPolicy: Always
8475+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8476+
imagePullPolicy: IfNotPresent
84788477
name: contour
84798478
ports:
84808479
- containerPort: 8001
@@ -8562,8 +8561,8 @@ spec:
85628561
args:
85638562
- envoy
85648563
- shutdown-manager
8565-
image: ghcr.io/projectcontour/contour:main
8566-
imagePullPolicy: Always
8564+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8565+
imagePullPolicy: IfNotPresent
85678566
lifecycle:
85688567
preStop:
85698568
exec:
@@ -8640,8 +8639,8 @@ spec:
86408639
- --envoy-key-file=/certs/tls.key
86418640
command:
86428641
- contour
8643-
image: ghcr.io/projectcontour/contour:main
8644-
imagePullPolicy: Always
8642+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8643+
imagePullPolicy: IfNotPresent
86458644
name: envoy-initconfig
86468645
volumeMounts:
86478646
- name: envoy-config

‎examples/render/contour.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8205,19 +8205,18 @@ rules:
82058205
apiVersion: batch/v1
82068206
kind: Job
82078207
metadata:
8208-
name: contour-certgen-main
8208+
name: contour-certgen-v1-26-0-rc-1
82098209
namespace: projectcontour
82108210
spec:
8211-
ttlSecondsAfterFinished: 0
82128211
template:
82138212
metadata:
82148213
labels:
82158214
app: "contour-certgen"
82168215
spec:
82178216
containers:
82188217
- name: contour
8219-
image: ghcr.io/projectcontour/contour:main
8220-
imagePullPolicy: Always
8218+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8219+
imagePullPolicy: IfNotPresent
82218220
command:
82228221
- contour
82238222
- certgen
@@ -8467,8 +8466,8 @@ spec:
84678466
- --contour-key-file=/certs/tls.key
84688467
- --config-path=/config/contour.yaml
84698468
command: ["contour"]
8470-
image: ghcr.io/projectcontour/contour:main
8471-
imagePullPolicy: Always
8469+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8470+
imagePullPolicy: IfNotPresent
84728471
name: contour
84738472
ports:
84748473
- containerPort: 8001
@@ -8556,8 +8555,8 @@ spec:
85568555
args:
85578556
- envoy
85588557
- shutdown-manager
8559-
image: ghcr.io/projectcontour/contour:main
8560-
imagePullPolicy: Always
8558+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8559+
imagePullPolicy: IfNotPresent
85618560
lifecycle:
85628561
preStop:
85638562
exec:
@@ -8634,8 +8633,8 @@ spec:
86348633
- --envoy-key-file=/certs/tls.key
86358634
command:
86368635
- contour
8637-
image: ghcr.io/projectcontour/contour:main
8638-
imagePullPolicy: Always
8636+
image: ghcr.io/projectcontour/contour:v1.26.0-rc.1
8637+
imagePullPolicy: IfNotPresent
86398638
name: envoy-initconfig
86408639
volumeMounts:
86418640
- name: envoy-config

0 commit comments

Comments
 (0)