Skip to content

Commit ef54337

Browse files
skrissskriss
committed
Update Contour Docker image to v1.25.0-rc.1.
Signed-off-by: Steve Kriss <[email protected]>
1 parent 2d11aff commit ef54337

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.25.0-rc.1",
3737
envoyImage: "docker.io/envoyproxy/envoy:v1.26.1",
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.25.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.25.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.25.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.25.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.25.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.25.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.25.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.25.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
@@ -7584,19 +7584,18 @@ rules:
75847584
apiVersion: batch/v1
75857585
kind: Job
75867586
metadata:
7587-
name: contour-certgen-main
7587+
name: contour-certgen-v1.25.0-rc.1
75887588
namespace: projectcontour
75897589
spec:
7590-
ttlSecondsAfterFinished: 0
75917590
template:
75927591
metadata:
75937592
labels:
75947593
app: "contour-certgen"
75957594
spec:
75967595
containers:
75977596
- name: contour
7598-
image: ghcr.io/projectcontour/contour:main
7599-
imagePullPolicy: Always
7597+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7598+
imagePullPolicy: IfNotPresent
76007599
command:
76017600
- contour
76027601
- certgen
@@ -7844,8 +7843,8 @@ spec:
78447843
- --contour-key-file=/certs/tls.key
78457844
- --config-path=/config/contour.yaml
78467845
command: ["contour"]
7847-
image: ghcr.io/projectcontour/contour:main
7848-
imagePullPolicy: Always
7846+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7847+
imagePullPolicy: IfNotPresent
78497848
name: contour
78507849
ports:
78517850
- containerPort: 8001
@@ -7946,8 +7945,8 @@ spec:
79467945
args:
79477946
- envoy
79487947
- shutdown-manager
7949-
image: ghcr.io/projectcontour/contour:main
7950-
imagePullPolicy: Always
7948+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7949+
imagePullPolicy: IfNotPresent
79517950
lifecycle:
79527951
preStop:
79537952
exec:
@@ -8024,8 +8023,8 @@ spec:
80248023
- --envoy-key-file=/certs/tls.key
80258024
command:
80268025
- contour
8027-
image: ghcr.io/projectcontour/contour:main
8028-
imagePullPolicy: Always
8026+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
8027+
imagePullPolicy: IfNotPresent
80298028
name: envoy-initconfig
80308029
volumeMounts:
80318030
- name: envoy-config

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16843,8 +16843,8 @@ spec:
1684316843
- --metrics-addr=127.0.0.1:8080
1684416844
- --enable-leader-election
1684516845
command: ["contour"]
16846-
image: ghcr.io/projectcontour/contour:main
16847-
imagePullPolicy: Always
16846+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
16847+
imagePullPolicy: IfNotPresent
1684816848
name: contour-gateway-provisioner
1684916849
resources:
1685016850
requests:

‎examples/render/contour-gateway.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -7590,19 +7590,18 @@ rules:
75907590
apiVersion: batch/v1
75917591
kind: Job
75927592
metadata:
7593-
name: contour-certgen-main
7593+
name: contour-certgen-v1.25.0-rc.1
75947594
namespace: projectcontour
75957595
spec:
7596-
ttlSecondsAfterFinished: 0
75977596
template:
75987597
metadata:
75997598
labels:
76007599
app: "contour-certgen"
76017600
spec:
76027601
containers:
76037602
- name: contour
7604-
image: ghcr.io/projectcontour/contour:main
7605-
imagePullPolicy: Always
7603+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7604+
imagePullPolicy: IfNotPresent
76067605
command:
76077606
- contour
76087607
- certgen
@@ -7850,8 +7849,8 @@ spec:
78507849
- --contour-key-file=/certs/tls.key
78517850
- --config-path=/config/contour.yaml
78527851
command: ["contour"]
7853-
image: ghcr.io/projectcontour/contour:main
7854-
imagePullPolicy: Always
7852+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7853+
imagePullPolicy: IfNotPresent
78557854
name: contour
78567855
ports:
78577856
- containerPort: 8001
@@ -7939,8 +7938,8 @@ spec:
79397938
args:
79407939
- envoy
79417940
- shutdown-manager
7942-
image: ghcr.io/projectcontour/contour:main
7943-
imagePullPolicy: Always
7941+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7942+
imagePullPolicy: IfNotPresent
79447943
lifecycle:
79457944
preStop:
79467945
exec:
@@ -8017,8 +8016,8 @@ spec:
80178016
- --envoy-key-file=/certs/tls.key
80188017
command:
80198018
- contour
8020-
image: ghcr.io/projectcontour/contour:main
8021-
imagePullPolicy: Always
8019+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
8020+
imagePullPolicy: IfNotPresent
80228021
name: envoy-initconfig
80238022
volumeMounts:
80248023
- name: envoy-config

‎examples/render/contour.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -7584,19 +7584,18 @@ rules:
75847584
apiVersion: batch/v1
75857585
kind: Job
75867586
metadata:
7587-
name: contour-certgen-main
7587+
name: contour-certgen-v1.25.0-rc.1
75887588
namespace: projectcontour
75897589
spec:
7590-
ttlSecondsAfterFinished: 0
75917590
template:
75927591
metadata:
75937592
labels:
75947593
app: "contour-certgen"
75957594
spec:
75967595
containers:
75977596
- name: contour
7598-
image: ghcr.io/projectcontour/contour:main
7599-
imagePullPolicy: Always
7597+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7598+
imagePullPolicy: IfNotPresent
76007599
command:
76017600
- contour
76027601
- certgen
@@ -7844,8 +7843,8 @@ spec:
78447843
- --contour-key-file=/certs/tls.key
78457844
- --config-path=/config/contour.yaml
78467845
command: ["contour"]
7847-
image: ghcr.io/projectcontour/contour:main
7848-
imagePullPolicy: Always
7846+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7847+
imagePullPolicy: IfNotPresent
78497848
name: contour
78507849
ports:
78517850
- containerPort: 8001
@@ -7933,8 +7932,8 @@ spec:
79337932
args:
79347933
- envoy
79357934
- shutdown-manager
7936-
image: ghcr.io/projectcontour/contour:main
7937-
imagePullPolicy: Always
7935+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
7936+
imagePullPolicy: IfNotPresent
79387937
lifecycle:
79397938
preStop:
79407939
exec:
@@ -8011,8 +8010,8 @@ spec:
80118010
- --envoy-key-file=/certs/tls.key
80128011
command:
80138012
- contour
8014-
image: ghcr.io/projectcontour/contour:main
8015-
imagePullPolicy: Always
8013+
image: ghcr.io/projectcontour/contour:v1.25.0-rc.1
8014+
imagePullPolicy: IfNotPresent
80168015
name: envoy-initconfig
80178016
volumeMounts:
80188017
- name: envoy-config

0 commit comments

Comments
 (0)