Skip to content

Commit 5b58e34

Browse files
sunjayBhatiasunjayBhatia
committedAug 29, 2023
Update Contour Docker image to v1.26.0.
Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
·
v1.26.3v1.26.0
1 parent 5471ca3 commit 5b58e34

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",
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
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
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
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
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
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
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
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
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
@@ -8288,19 +8288,18 @@ rules:
82888288
apiVersion: batch/v1
82898289
kind: Job
82908290
metadata:
8291-
name: contour-certgen-main
8291+
name: contour-certgen-v1-26-0
82928292
namespace: projectcontour
82938293
spec:
8294-
ttlSecondsAfterFinished: 0
82958294
template:
82968295
metadata:
82978296
labels:
82988297
app: "contour-certgen"
82998298
spec:
83008299
containers:
83018300
- name: contour
8302-
image: ghcr.io/projectcontour/contour:main
8303-
imagePullPolicy: Always
8301+
image: ghcr.io/projectcontour/contour:v1.26.0
8302+
imagePullPolicy: IfNotPresent
83048303
command:
83058304
- contour
83068305
- certgen
@@ -8550,8 +8549,8 @@ spec:
85508549
- --contour-key-file=/certs/tls.key
85518550
- --config-path=/config/contour.yaml
85528551
command: ["contour"]
8553-
image: ghcr.io/projectcontour/contour:main
8554-
imagePullPolicy: Always
8552+
image: ghcr.io/projectcontour/contour:v1.26.0
8553+
imagePullPolicy: IfNotPresent
85558554
name: contour
85568555
ports:
85578556
- containerPort: 8001
@@ -8652,8 +8651,8 @@ spec:
86528651
args:
86538652
- envoy
86548653
- shutdown-manager
8655-
image: ghcr.io/projectcontour/contour:main
8656-
imagePullPolicy: Always
8654+
image: ghcr.io/projectcontour/contour:v1.26.0
8655+
imagePullPolicy: IfNotPresent
86578656
lifecycle:
86588657
preStop:
86598658
exec:
@@ -8730,8 +8729,8 @@ spec:
87308729
- --envoy-key-file=/certs/tls.key
87318730
command:
87328731
- contour
8733-
image: ghcr.io/projectcontour/contour:main
8734-
imagePullPolicy: Always
8732+
image: ghcr.io/projectcontour/contour:v1.26.0
8733+
imagePullPolicy: IfNotPresent
87358734
name: envoy-initconfig
87368735
volumeMounts:
87378736
- name: envoy-config

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19317,8 +19317,8 @@ spec:
1931719317
- --metrics-addr=127.0.0.1:8080
1931819318
- --enable-leader-election
1931919319
command: ["contour"]
19320-
image: ghcr.io/projectcontour/contour:main
19321-
imagePullPolicy: Always
19320+
image: ghcr.io/projectcontour/contour:v1.26.0
19321+
imagePullPolicy: IfNotPresent
1932219322
name: contour-gateway-provisioner
1932319323
resources:
1932419324
requests:

‎examples/render/contour-gateway.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8294,19 +8294,18 @@ rules:
82948294
apiVersion: batch/v1
82958295
kind: Job
82968296
metadata:
8297-
name: contour-certgen-main
8297+
name: contour-certgen-v1-26-0
82988298
namespace: projectcontour
82998299
spec:
8300-
ttlSecondsAfterFinished: 0
83018300
template:
83028301
metadata:
83038302
labels:
83048303
app: "contour-certgen"
83058304
spec:
83068305
containers:
83078306
- name: contour
8308-
image: ghcr.io/projectcontour/contour:main
8309-
imagePullPolicy: Always
8307+
image: ghcr.io/projectcontour/contour:v1.26.0
8308+
imagePullPolicy: IfNotPresent
83108309
command:
83118310
- contour
83128311
- certgen
@@ -8556,8 +8555,8 @@ spec:
85568555
- --contour-key-file=/certs/tls.key
85578556
- --config-path=/config/contour.yaml
85588557
command: ["contour"]
8559-
image: ghcr.io/projectcontour/contour:main
8560-
imagePullPolicy: Always
8558+
image: ghcr.io/projectcontour/contour:v1.26.0
8559+
imagePullPolicy: IfNotPresent
85618560
name: contour
85628561
ports:
85638562
- containerPort: 8001
@@ -8645,8 +8644,8 @@ spec:
86458644
args:
86468645
- envoy
86478646
- shutdown-manager
8648-
image: ghcr.io/projectcontour/contour:main
8649-
imagePullPolicy: Always
8647+
image: ghcr.io/projectcontour/contour:v1.26.0
8648+
imagePullPolicy: IfNotPresent
86508649
lifecycle:
86518650
preStop:
86528651
exec:
@@ -8723,8 +8722,8 @@ spec:
87238722
- --envoy-key-file=/certs/tls.key
87248723
command:
87258724
- contour
8726-
image: ghcr.io/projectcontour/contour:main
8727-
imagePullPolicy: Always
8725+
image: ghcr.io/projectcontour/contour:v1.26.0
8726+
imagePullPolicy: IfNotPresent
87288727
name: envoy-initconfig
87298728
volumeMounts:
87308729
- name: envoy-config

‎examples/render/contour.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8288,19 +8288,18 @@ rules:
82888288
apiVersion: batch/v1
82898289
kind: Job
82908290
metadata:
8291-
name: contour-certgen-main
8291+
name: contour-certgen-v1-26-0
82928292
namespace: projectcontour
82938293
spec:
8294-
ttlSecondsAfterFinished: 0
82958294
template:
82968295
metadata:
82978296
labels:
82988297
app: "contour-certgen"
82998298
spec:
83008299
containers:
83018300
- name: contour
8302-
image: ghcr.io/projectcontour/contour:main
8303-
imagePullPolicy: Always
8301+
image: ghcr.io/projectcontour/contour:v1.26.0
8302+
imagePullPolicy: IfNotPresent
83048303
command:
83058304
- contour
83068305
- certgen
@@ -8550,8 +8549,8 @@ spec:
85508549
- --contour-key-file=/certs/tls.key
85518550
- --config-path=/config/contour.yaml
85528551
command: ["contour"]
8553-
image: ghcr.io/projectcontour/contour:main
8554-
imagePullPolicy: Always
8552+
image: ghcr.io/projectcontour/contour:v1.26.0
8553+
imagePullPolicy: IfNotPresent
85558554
name: contour
85568555
ports:
85578556
- containerPort: 8001
@@ -8639,8 +8638,8 @@ spec:
86398638
args:
86408639
- envoy
86418640
- shutdown-manager
8642-
image: ghcr.io/projectcontour/contour:main
8643-
imagePullPolicy: Always
8641+
image: ghcr.io/projectcontour/contour:v1.26.0
8642+
imagePullPolicy: IfNotPresent
86448643
lifecycle:
86458644
preStop:
86468645
exec:
@@ -8717,8 +8716,8 @@ spec:
87178716
- --envoy-key-file=/certs/tls.key
87188717
command:
87198718
- contour
8720-
image: ghcr.io/projectcontour/contour:main
8721-
imagePullPolicy: Always
8719+
image: ghcr.io/projectcontour/contour:v1.26.0
8720+
imagePullPolicy: IfNotPresent
87228721
name: envoy-initconfig
87238722
volumeMounts:
87248723
- name: envoy-config

0 commit comments

Comments
 (0)
Please sign in to comment.