Skip to content

Commit 86c31bc

Browse files
committed
Update Contour Docker image to v1.31.0.
Signed-off-by: Sunjay Bhatia <[email protected]>
1 parent 0d342ab commit 86c31bc

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.31.0",
3939
envoyImage: "docker.io/envoyproxy/envoy:v1.34.0",
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-31-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.31.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.31.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.31.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.31.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.31.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.31.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.31.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
@@ -9055,19 +9055,18 @@ rules:
90559055
apiVersion: batch/v1
90569056
kind: Job
90579057
metadata:
9058-
name: contour-certgen-main
9058+
name: contour-certgen-v1-31-0
90599059
namespace: projectcontour
90609060
spec:
9061-
ttlSecondsAfterFinished: 0
90629061
template:
90639062
metadata:
90649063
labels:
90659064
app: "contour-certgen"
90669065
spec:
90679066
containers:
90689067
- name: contour
9069-
image: ghcr.io/projectcontour/contour:main
9070-
imagePullPolicy: Always
9068+
image: ghcr.io/projectcontour/contour:v1.31.0
9069+
imagePullPolicy: IfNotPresent
90719070
command:
90729071
- contour
90739072
- certgen
@@ -9324,8 +9323,8 @@ spec:
93249323
- --contour-key-file=/certs/tls.key
93259324
- --config-path=/config/contour.yaml
93269325
command: ["contour"]
9327-
image: ghcr.io/projectcontour/contour:main
9328-
imagePullPolicy: Always
9326+
image: ghcr.io/projectcontour/contour:v1.31.0
9327+
imagePullPolicy: IfNotPresent
93299328
name: contour
93309329
ports:
93319330
- containerPort: 8001
@@ -9420,8 +9419,8 @@ spec:
94209419
args:
94219420
- envoy
94229421
- shutdown-manager
9423-
image: ghcr.io/projectcontour/contour:main
9424-
imagePullPolicy: Always
9422+
image: ghcr.io/projectcontour/contour:v1.31.0
9423+
imagePullPolicy: IfNotPresent
94259424
lifecycle:
94269425
preStop:
94279426
exec:
@@ -9502,8 +9501,8 @@ spec:
95029501
- --envoy-key-file=/certs/tls.key
95039502
command:
95049503
- contour
9505-
image: ghcr.io/projectcontour/contour:main
9506-
imagePullPolicy: Always
9504+
image: ghcr.io/projectcontour/contour:v1.31.0
9505+
imagePullPolicy: IfNotPresent
95079506
name: envoy-initconfig
95089507
volumeMounts:
95099508
- name: envoy-config

examples/render/contour-gateway-provisioner.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23951,8 +23951,8 @@ spec:
2395123951
- --metrics-addr=127.0.0.1:8080
2395223952
- --enable-leader-election
2395323953
command: ["contour"]
23954-
image: ghcr.io/projectcontour/contour:main
23955-
imagePullPolicy: Always
23954+
image: ghcr.io/projectcontour/contour:v1.31.0
23955+
imagePullPolicy: IfNotPresent
2395623956
name: contour-gateway-provisioner
2395723957
resources:
2395823958
requests:

examples/render/contour-gateway.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8872,19 +8872,18 @@ rules:
88728872
apiVersion: batch/v1
88738873
kind: Job
88748874
metadata:
8875-
name: contour-certgen-main
8875+
name: contour-certgen-v1-31-0
88768876
namespace: projectcontour
88778877
spec:
8878-
ttlSecondsAfterFinished: 0
88798878
template:
88808879
metadata:
88818880
labels:
88828881
app: "contour-certgen"
88838882
spec:
88848883
containers:
88858884
- name: contour
8886-
image: ghcr.io/projectcontour/contour:main
8887-
imagePullPolicy: Always
8885+
image: ghcr.io/projectcontour/contour:v1.31.0
8886+
imagePullPolicy: IfNotPresent
88888887
command:
88898888
- contour
88908889
- certgen
@@ -9141,8 +9140,8 @@ spec:
91419140
- --contour-key-file=/certs/tls.key
91429141
- --config-path=/config/contour.yaml
91439142
command: ["contour"]
9144-
image: ghcr.io/projectcontour/contour:main
9145-
imagePullPolicy: Always
9143+
image: ghcr.io/projectcontour/contour:v1.31.0
9144+
imagePullPolicy: IfNotPresent
91469145
name: contour
91479146
ports:
91489147
- containerPort: 8001
@@ -9225,8 +9224,8 @@ spec:
92259224
args:
92269225
- envoy
92279226
- shutdown-manager
9228-
image: ghcr.io/projectcontour/contour:main
9229-
imagePullPolicy: Always
9227+
image: ghcr.io/projectcontour/contour:v1.31.0
9228+
imagePullPolicy: IfNotPresent
92309229
lifecycle:
92319230
preStop:
92329231
exec:
@@ -9307,8 +9306,8 @@ spec:
93079306
- --envoy-key-file=/certs/tls.key
93089307
command:
93099308
- contour
9310-
image: ghcr.io/projectcontour/contour:main
9311-
imagePullPolicy: Always
9309+
image: ghcr.io/projectcontour/contour:v1.31.0
9310+
imagePullPolicy: IfNotPresent
93129311
name: envoy-initconfig
93139312
volumeMounts:
93149313
- name: envoy-config

examples/render/contour.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9055,19 +9055,18 @@ rules:
90559055
apiVersion: batch/v1
90569056
kind: Job
90579057
metadata:
9058-
name: contour-certgen-main
9058+
name: contour-certgen-v1-31-0
90599059
namespace: projectcontour
90609060
spec:
9061-
ttlSecondsAfterFinished: 0
90629061
template:
90639062
metadata:
90649063
labels:
90659064
app: "contour-certgen"
90669065
spec:
90679066
containers:
90689067
- name: contour
9069-
image: ghcr.io/projectcontour/contour:main
9070-
imagePullPolicy: Always
9068+
image: ghcr.io/projectcontour/contour:v1.31.0
9069+
imagePullPolicy: IfNotPresent
90719070
command:
90729071
- contour
90739072
- certgen
@@ -9324,8 +9323,8 @@ spec:
93249323
- --contour-key-file=/certs/tls.key
93259324
- --config-path=/config/contour.yaml
93269325
command: ["contour"]
9327-
image: ghcr.io/projectcontour/contour:main
9328-
imagePullPolicy: Always
9326+
image: ghcr.io/projectcontour/contour:v1.31.0
9327+
imagePullPolicy: IfNotPresent
93299328
name: contour
93309329
ports:
93319330
- containerPort: 8001
@@ -9408,8 +9407,8 @@ spec:
94089407
args:
94099408
- envoy
94109409
- shutdown-manager
9411-
image: ghcr.io/projectcontour/contour:main
9412-
imagePullPolicy: Always
9410+
image: ghcr.io/projectcontour/contour:v1.31.0
9411+
imagePullPolicy: IfNotPresent
94139412
lifecycle:
94149413
preStop:
94159414
exec:
@@ -9490,8 +9489,8 @@ spec:
94909489
- --envoy-key-file=/certs/tls.key
94919490
command:
94929491
- contour
9493-
image: ghcr.io/projectcontour/contour:main
9494-
imagePullPolicy: Always
9492+
image: ghcr.io/projectcontour/contour:v1.31.0
9493+
imagePullPolicy: IfNotPresent
94959494
name: envoy-initconfig
94969495
volumeMounts:
94979496
- name: envoy-config

0 commit comments

Comments
 (0)