Skip to content

Commit

Permalink
Update Contour Docker image to v1.30.0.
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
  • Loading branch information
skriss committed Jul 31, 2024
1 parent 218c296 commit 00de904
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 49 deletions.
2 changes: 1 addition & 1 deletion cmd/contour/gatewayprovisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, *
cmd := app.Command("gateway-provisioner", "Run contour gateway provisioner.")

provisionerConfig := &gatewayProvisionerConfig{
contourImage: "ghcr.io/projectcontour/contour:main",
contourImage: "ghcr.io/projectcontour/contour:v1.30.0",
envoyImage: "docker.io/envoyproxy/envoy:v1.31.0",
metricsBindAddress: ":8080",
leaderElection: false,
Expand Down
7 changes: 3 additions & 4 deletions examples/contour/02-job-certgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,18 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-main
name: contour-certgen-v1-30-0
namespace: projectcontour
spec:
ttlSecondsAfterFinished: 0
template:
metadata:
labels:
app: "contour-certgen"
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
command:
- contour
- certgen
Expand Down
4 changes: 2 additions & 2 deletions examples/contour/03-contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ spec:
- --contour-key-file=/certs/tls.key
- --config-path=/config/contour.yaml
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour
ports:
- containerPort: 8001
Expand Down
8 changes: 4 additions & 4 deletions examples/contour/03-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -107,8 +107,8 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
- name: envoy-config
Expand Down
8 changes: 4 additions & 4 deletions examples/deployment/03-envoy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -119,8 +119,8 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
- name: envoy-config
Expand Down
4 changes: 2 additions & 2 deletions examples/gateway-provisioner/03-gateway-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ spec:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour-gateway-provisioner
resources:
requests:
Expand Down
19 changes: 9 additions & 10 deletions examples/render/contour-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8923,19 +8923,18 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-main
name: contour-certgen-v1-30-0
namespace: projectcontour
spec:
ttlSecondsAfterFinished: 0
template:
metadata:
labels:
app: "contour-certgen"
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
command:
- contour
- certgen
Expand Down Expand Up @@ -9193,8 +9192,8 @@ spec:
- --contour-key-file=/certs/tls.key
- --config-path=/config/contour.yaml
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour
ports:
- containerPort: 8001
Expand Down Expand Up @@ -9289,8 +9288,8 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -9371,8 +9370,8 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
- name: envoy-config
Expand Down
4 changes: 2 additions & 2 deletions examples/render/contour-gateway-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25513,8 +25513,8 @@ spec:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour-gateway-provisioner
resources:
requests:
Expand Down
19 changes: 9 additions & 10 deletions examples/render/contour-gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8739,19 +8739,18 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-main
name: contour-certgen-v1-30-0
namespace: projectcontour
spec:
ttlSecondsAfterFinished: 0
template:
metadata:
labels:
app: "contour-certgen"
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
command:
- contour
- certgen
Expand Down Expand Up @@ -9009,8 +9008,8 @@ spec:
- --contour-key-file=/certs/tls.key
- --config-path=/config/contour.yaml
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour
ports:
- containerPort: 8001
Expand Down Expand Up @@ -9093,8 +9092,8 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -9175,8 +9174,8 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
- name: envoy-config
Expand Down
19 changes: 9 additions & 10 deletions examples/render/contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8923,19 +8923,18 @@ rules:
apiVersion: batch/v1
kind: Job
metadata:
name: contour-certgen-main
name: contour-certgen-v1-30-0
namespace: projectcontour
spec:
ttlSecondsAfterFinished: 0
template:
metadata:
labels:
app: "contour-certgen"
spec:
containers:
- name: contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
command:
- contour
- certgen
Expand Down Expand Up @@ -9193,8 +9192,8 @@ spec:
- --contour-key-file=/certs/tls.key
- --config-path=/config/contour.yaml
command: ["contour"]
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: contour
ports:
- containerPort: 8001
Expand Down Expand Up @@ -9277,8 +9276,8 @@ spec:
args:
- envoy
- shutdown-manager
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -9359,8 +9358,8 @@ spec:
- --envoy-key-file=/certs/tls.key
command:
- contour
image: ghcr.io/projectcontour/contour:main
imagePullPolicy: Always
image: ghcr.io/projectcontour/contour:v1.30.0
imagePullPolicy: IfNotPresent
name: envoy-initconfig
volumeMounts:
- name: envoy-config
Expand Down

0 comments on commit 00de904

Please sign in to comment.