Skip to content

Commit 00de904

Browse files
committed
Update Contour Docker image to v1.30.0.
Signed-off-by: Steve Kriss <[email protected]>
1 parent 218c296 commit 00de904

10 files changed

+45
-49
lines changed

cmd/contour/gatewayprovisioner.go

+1-1
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.30.0",
3939
envoyImage: "docker.io/envoyproxy/envoy:v1.31.0",
4040
metricsBindAddress: ":8080",
4141
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-30-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.30.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
@@ -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.30.0
46+
imagePullPolicy: IfNotPresent
4747
name: contour
4848
ports:
4949
- containerPort: 8001

examples/contour/03-envoy.yaml

+4-4
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.30.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.30.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
@@ -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.30.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.30.0
123+
imagePullPolicy: IfNotPresent
124124
name: envoy-initconfig
125125
volumeMounts:
126126
- 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.30.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
@@ -8923,19 +8923,18 @@ rules:
89238923
apiVersion: batch/v1
89248924
kind: Job
89258925
metadata:
8926-
name: contour-certgen-main
8926+
name: contour-certgen-v1-30-0
89278927
namespace: projectcontour
89288928
spec:
8929-
ttlSecondsAfterFinished: 0
89308929
template:
89318930
metadata:
89328931
labels:
89338932
app: "contour-certgen"
89348933
spec:
89358934
containers:
89368935
- name: contour
8937-
image: ghcr.io/projectcontour/contour:main
8938-
imagePullPolicy: Always
8936+
image: ghcr.io/projectcontour/contour:v1.30.0
8937+
imagePullPolicy: IfNotPresent
89398938
command:
89408939
- contour
89418940
- certgen
@@ -9193,8 +9192,8 @@ spec:
91939192
- --contour-key-file=/certs/tls.key
91949193
- --config-path=/config/contour.yaml
91959194
command: ["contour"]
9196-
image: ghcr.io/projectcontour/contour:main
9197-
imagePullPolicy: Always
9195+
image: ghcr.io/projectcontour/contour:v1.30.0
9196+
imagePullPolicy: IfNotPresent
91989197
name: contour
91999198
ports:
92009199
- containerPort: 8001
@@ -9289,8 +9288,8 @@ spec:
92899288
args:
92909289
- envoy
92919290
- shutdown-manager
9292-
image: ghcr.io/projectcontour/contour:main
9293-
imagePullPolicy: Always
9291+
image: ghcr.io/projectcontour/contour:v1.30.0
9292+
imagePullPolicy: IfNotPresent
92949293
lifecycle:
92959294
preStop:
92969295
exec:
@@ -9371,8 +9370,8 @@ spec:
93719370
- --envoy-key-file=/certs/tls.key
93729371
command:
93739372
- contour
9374-
image: ghcr.io/projectcontour/contour:main
9375-
imagePullPolicy: Always
9373+
image: ghcr.io/projectcontour/contour:v1.30.0
9374+
imagePullPolicy: IfNotPresent
93769375
name: envoy-initconfig
93779376
volumeMounts:
93789377
- name: envoy-config

examples/render/contour-gateway-provisioner.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25513,8 +25513,8 @@ spec:
2551325513
- --metrics-addr=127.0.0.1:8080
2551425514
- --enable-leader-election
2551525515
command: ["contour"]
25516-
image: ghcr.io/projectcontour/contour:main
25517-
imagePullPolicy: Always
25516+
image: ghcr.io/projectcontour/contour:v1.30.0
25517+
imagePullPolicy: IfNotPresent
2551825518
name: contour-gateway-provisioner
2551925519
resources:
2552025520
requests:

examples/render/contour-gateway.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8739,19 +8739,18 @@ rules:
87398739
apiVersion: batch/v1
87408740
kind: Job
87418741
metadata:
8742-
name: contour-certgen-main
8742+
name: contour-certgen-v1-30-0
87438743
namespace: projectcontour
87448744
spec:
8745-
ttlSecondsAfterFinished: 0
87468745
template:
87478746
metadata:
87488747
labels:
87498748
app: "contour-certgen"
87508749
spec:
87518750
containers:
87528751
- name: contour
8753-
image: ghcr.io/projectcontour/contour:main
8754-
imagePullPolicy: Always
8752+
image: ghcr.io/projectcontour/contour:v1.30.0
8753+
imagePullPolicy: IfNotPresent
87558754
command:
87568755
- contour
87578756
- certgen
@@ -9009,8 +9008,8 @@ spec:
90099008
- --contour-key-file=/certs/tls.key
90109009
- --config-path=/config/contour.yaml
90119010
command: ["contour"]
9012-
image: ghcr.io/projectcontour/contour:main
9013-
imagePullPolicy: Always
9011+
image: ghcr.io/projectcontour/contour:v1.30.0
9012+
imagePullPolicy: IfNotPresent
90149013
name: contour
90159014
ports:
90169015
- containerPort: 8001
@@ -9093,8 +9092,8 @@ spec:
90939092
args:
90949093
- envoy
90959094
- shutdown-manager
9096-
image: ghcr.io/projectcontour/contour:main
9097-
imagePullPolicy: Always
9095+
image: ghcr.io/projectcontour/contour:v1.30.0
9096+
imagePullPolicy: IfNotPresent
90989097
lifecycle:
90999098
preStop:
91009099
exec:
@@ -9175,8 +9174,8 @@ spec:
91759174
- --envoy-key-file=/certs/tls.key
91769175
command:
91779176
- contour
9178-
image: ghcr.io/projectcontour/contour:main
9179-
imagePullPolicy: Always
9177+
image: ghcr.io/projectcontour/contour:v1.30.0
9178+
imagePullPolicy: IfNotPresent
91809179
name: envoy-initconfig
91819180
volumeMounts:
91829181
- name: envoy-config

examples/render/contour.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -8923,19 +8923,18 @@ rules:
89238923
apiVersion: batch/v1
89248924
kind: Job
89258925
metadata:
8926-
name: contour-certgen-main
8926+
name: contour-certgen-v1-30-0
89278927
namespace: projectcontour
89288928
spec:
8929-
ttlSecondsAfterFinished: 0
89308929
template:
89318930
metadata:
89328931
labels:
89338932
app: "contour-certgen"
89348933
spec:
89358934
containers:
89368935
- name: contour
8937-
image: ghcr.io/projectcontour/contour:main
8938-
imagePullPolicy: Always
8936+
image: ghcr.io/projectcontour/contour:v1.30.0
8937+
imagePullPolicy: IfNotPresent
89398938
command:
89408939
- contour
89418940
- certgen
@@ -9193,8 +9192,8 @@ spec:
91939192
- --contour-key-file=/certs/tls.key
91949193
- --config-path=/config/contour.yaml
91959194
command: ["contour"]
9196-
image: ghcr.io/projectcontour/contour:main
9197-
imagePullPolicy: Always
9195+
image: ghcr.io/projectcontour/contour:v1.30.0
9196+
imagePullPolicy: IfNotPresent
91989197
name: contour
91999198
ports:
92009199
- containerPort: 8001
@@ -9277,8 +9276,8 @@ spec:
92779276
args:
92789277
- envoy
92799278
- shutdown-manager
9280-
image: ghcr.io/projectcontour/contour:main
9281-
imagePullPolicy: Always
9279+
image: ghcr.io/projectcontour/contour:v1.30.0
9280+
imagePullPolicy: IfNotPresent
92829281
lifecycle:
92839282
preStop:
92849283
exec:
@@ -9359,8 +9358,8 @@ spec:
93599358
- --envoy-key-file=/certs/tls.key
93609359
command:
93619360
- contour
9362-
image: ghcr.io/projectcontour/contour:main
9363-
imagePullPolicy: Always
9361+
image: ghcr.io/projectcontour/contour:v1.30.0
9362+
imagePullPolicy: IfNotPresent
93649363
name: envoy-initconfig
93659364
volumeMounts:
93669365
- name: envoy-config

0 commit comments

Comments
 (0)