Skip to content

Commit 3635b06

Browse files
committed
Update Contour Docker image to v1.33.0.
Signed-off-by: Sunjay Bhatia <[email protected]>
1 parent 7c737c9 commit 3635b06

File tree

10 files changed

+45
-49
lines changed

10 files changed

+45
-49
lines changed

cmd/contour/gatewayprovisioner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, *
3535
cmd := app.Command("gateway-provisioner", "Run contour gateway provisioner.")
3636

3737
provisionerConfig := &gatewayProvisionerConfig{
38-
contourImage: "ghcr.io/projectcontour/contour:main",
38+
contourImage: "ghcr.io/projectcontour/contour:v1.33.0",
3939
envoyImage: "docker.io/envoyproxy/envoy:distroless-v1.35.2",
4040
metricsBindAddress: ":8080",
4141
leaderElection: false,

examples/contour/02-job-certgen.yaml

Lines changed: 3 additions & 4 deletions
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-33-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.33.0
50+
imagePullPolicy: IfNotPresent
5251
command:
5352
- contour
5453
- certgen

examples/contour/03-contour.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ spec:
4242
- --contour-key-file=/certs/tls.key
4343
- --config-path=/config/contour.yaml
4444
command: ["contour"]
45-
image: ghcr.io/projectcontour/contour:main
46-
imagePullPolicy: Always
45+
image: ghcr.io/projectcontour/contour:v1.33.0
46+
imagePullPolicy: IfNotPresent
4747
name: contour
4848
ports:
4949
- containerPort: 8001

examples/contour/03-envoy.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
args:
2626
- envoy
2727
- shutdown-manager
28-
image: ghcr.io/projectcontour/contour:main
29-
imagePullPolicy: Always
28+
image: ghcr.io/projectcontour/contour:v1.33.0
29+
imagePullPolicy: IfNotPresent
3030
lifecycle:
3131
preStop:
3232
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.33.0
111+
imagePullPolicy: IfNotPresent
112112
name: envoy-initconfig
113113
volumeMounts:
114114
- name: envoy-config

examples/deployment/03-envoy-deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ spec:
3737
args:
3838
- envoy
3939
- shutdown-manager
40-
image: ghcr.io/projectcontour/contour:main
41-
imagePullPolicy: Always
40+
image: ghcr.io/projectcontour/contour:v1.33.0
41+
imagePullPolicy: IfNotPresent
4242
lifecycle:
4343
preStop:
4444
exec:
@@ -119,8 +119,8 @@ spec:
119119
- --envoy-key-file=/certs/tls.key
120120
command:
121121
- contour
122-
image: ghcr.io/projectcontour/contour:main
123-
imagePullPolicy: Always
122+
image: ghcr.io/projectcontour/contour:v1.33.0
123+
imagePullPolicy: IfNotPresent
124124
name: envoy-initconfig
125125
volumeMounts:
126126
- name: envoy-config

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

Lines changed: 2 additions & 2 deletions
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.33.0
26+
imagePullPolicy: IfNotPresent
2727
name: contour-gateway-provisioner
2828
resources:
2929
requests:

examples/render/contour-deployment.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9140,19 +9140,18 @@ rules:
91409140
apiVersion: batch/v1
91419141
kind: Job
91429142
metadata:
9143-
name: contour-certgen-main
9143+
name: contour-certgen-v1-33-0
91449144
namespace: projectcontour
91459145
spec:
9146-
ttlSecondsAfterFinished: 0
91479146
template:
91489147
metadata:
91499148
labels:
91509149
app: "contour-certgen"
91519150
spec:
91529151
containers:
91539152
- name: contour
9154-
image: ghcr.io/projectcontour/contour:main
9155-
imagePullPolicy: Always
9153+
image: ghcr.io/projectcontour/contour:v1.33.0
9154+
imagePullPolicy: IfNotPresent
91569155
command:
91579156
- contour
91589157
- certgen
@@ -9409,8 +9408,8 @@ spec:
94099408
- --contour-key-file=/certs/tls.key
94109409
- --config-path=/config/contour.yaml
94119410
command: ["contour"]
9412-
image: ghcr.io/projectcontour/contour:main
9413-
imagePullPolicy: Always
9411+
image: ghcr.io/projectcontour/contour:v1.33.0
9412+
imagePullPolicy: IfNotPresent
94149413
name: contour
94159414
ports:
94169415
- containerPort: 8001
@@ -9505,8 +9504,8 @@ spec:
95059504
args:
95069505
- envoy
95079506
- shutdown-manager
9508-
image: ghcr.io/projectcontour/contour:main
9509-
imagePullPolicy: Always
9507+
image: ghcr.io/projectcontour/contour:v1.33.0
9508+
imagePullPolicy: IfNotPresent
95109509
lifecycle:
95119510
preStop:
95129511
exec:
@@ -9587,8 +9586,8 @@ spec:
95879586
- --envoy-key-file=/certs/tls.key
95889587
command:
95899588
- contour
9590-
image: ghcr.io/projectcontour/contour:main
9591-
imagePullPolicy: Always
9589+
image: ghcr.io/projectcontour/contour:v1.33.0
9590+
imagePullPolicy: IfNotPresent
95929591
name: envoy-initconfig
95939592
volumeMounts:
95949593
- name: envoy-config

examples/render/contour-gateway-provisioner.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26395,8 +26395,8 @@ spec:
2639526395
- --metrics-addr=127.0.0.1:8080
2639626396
- --enable-leader-election
2639726397
command: ["contour"]
26398-
image: ghcr.io/projectcontour/contour:main
26399-
imagePullPolicy: Always
26398+
image: ghcr.io/projectcontour/contour:v1.33.0
26399+
imagePullPolicy: IfNotPresent
2640026400
name: contour-gateway-provisioner
2640126401
resources:
2640226402
requests:

examples/render/contour-gateway.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8957,19 +8957,18 @@ rules:
89578957
apiVersion: batch/v1
89588958
kind: Job
89598959
metadata:
8960-
name: contour-certgen-main
8960+
name: contour-certgen-v1-33-0
89618961
namespace: projectcontour
89628962
spec:
8963-
ttlSecondsAfterFinished: 0
89648963
template:
89658964
metadata:
89668965
labels:
89678966
app: "contour-certgen"
89688967
spec:
89698968
containers:
89708969
- name: contour
8971-
image: ghcr.io/projectcontour/contour:main
8972-
imagePullPolicy: Always
8970+
image: ghcr.io/projectcontour/contour:v1.33.0
8971+
imagePullPolicy: IfNotPresent
89738972
command:
89748973
- contour
89758974
- certgen
@@ -9226,8 +9225,8 @@ spec:
92269225
- --contour-key-file=/certs/tls.key
92279226
- --config-path=/config/contour.yaml
92289227
command: ["contour"]
9229-
image: ghcr.io/projectcontour/contour:main
9230-
imagePullPolicy: Always
9228+
image: ghcr.io/projectcontour/contour:v1.33.0
9229+
imagePullPolicy: IfNotPresent
92319230
name: contour
92329231
ports:
92339232
- containerPort: 8001
@@ -9310,8 +9309,8 @@ spec:
93109309
args:
93119310
- envoy
93129311
- shutdown-manager
9313-
image: ghcr.io/projectcontour/contour:main
9314-
imagePullPolicy: Always
9312+
image: ghcr.io/projectcontour/contour:v1.33.0
9313+
imagePullPolicy: IfNotPresent
93159314
lifecycle:
93169315
preStop:
93179316
exec:
@@ -9392,8 +9391,8 @@ spec:
93929391
- --envoy-key-file=/certs/tls.key
93939392
command:
93949393
- contour
9395-
image: ghcr.io/projectcontour/contour:main
9396-
imagePullPolicy: Always
9394+
image: ghcr.io/projectcontour/contour:v1.33.0
9395+
imagePullPolicy: IfNotPresent
93979396
name: envoy-initconfig
93989397
volumeMounts:
93999398
- name: envoy-config

examples/render/contour.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9140,19 +9140,18 @@ rules:
91409140
apiVersion: batch/v1
91419141
kind: Job
91429142
metadata:
9143-
name: contour-certgen-main
9143+
name: contour-certgen-v1-33-0
91449144
namespace: projectcontour
91459145
spec:
9146-
ttlSecondsAfterFinished: 0
91479146
template:
91489147
metadata:
91499148
labels:
91509149
app: "contour-certgen"
91519150
spec:
91529151
containers:
91539152
- name: contour
9154-
image: ghcr.io/projectcontour/contour:main
9155-
imagePullPolicy: Always
9153+
image: ghcr.io/projectcontour/contour:v1.33.0
9154+
imagePullPolicy: IfNotPresent
91569155
command:
91579156
- contour
91589157
- certgen
@@ -9409,8 +9408,8 @@ spec:
94099408
- --contour-key-file=/certs/tls.key
94109409
- --config-path=/config/contour.yaml
94119410
command: ["contour"]
9412-
image: ghcr.io/projectcontour/contour:main
9413-
imagePullPolicy: Always
9411+
image: ghcr.io/projectcontour/contour:v1.33.0
9412+
imagePullPolicy: IfNotPresent
94149413
name: contour
94159414
ports:
94169415
- containerPort: 8001
@@ -9493,8 +9492,8 @@ spec:
94939492
args:
94949493
- envoy
94959494
- shutdown-manager
9496-
image: ghcr.io/projectcontour/contour:main
9497-
imagePullPolicy: Always
9495+
image: ghcr.io/projectcontour/contour:v1.33.0
9496+
imagePullPolicy: IfNotPresent
94989497
lifecycle:
94999498
preStop:
95009499
exec:
@@ -9575,8 +9574,8 @@ spec:
95759574
- --envoy-key-file=/certs/tls.key
95769575
command:
95779576
- contour
9578-
image: ghcr.io/projectcontour/contour:main
9579-
imagePullPolicy: Always
9577+
image: ghcr.io/projectcontour/contour:v1.33.0
9578+
imagePullPolicy: IfNotPresent
95809579
name: envoy-initconfig
95819580
volumeMounts:
95829581
- name: envoy-config

0 commit comments

Comments
 (0)