diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index 1fb1b562ec2..eee1395bf6c 100644 --- a/cmd/contour/gatewayprovisioner.go +++ b/cmd/contour/gatewayprovisioner.go @@ -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, diff --git a/examples/contour/02-job-certgen.yaml b/examples/contour/02-job-certgen.yaml index 35ba3d2fc7d..eda87b52614 100644 --- a/examples/contour/02-job-certgen.yaml +++ b/examples/contour/02-job-certgen.yaml @@ -36,10 +36,9 @@ 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: @@ -47,8 +46,8 @@ spec: 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 diff --git a/examples/contour/03-contour.yaml b/examples/contour/03-contour.yaml index 2db6109d01d..4226695ae43 100644 --- a/examples/contour/03-contour.yaml +++ b/examples/contour/03-contour.yaml @@ -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 diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index e8f09596f0f..8fba96c2728 100644 --- a/examples/contour/03-envoy.yaml +++ b/examples/contour/03-envoy.yaml @@ -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: @@ -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 diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml index 9b0f8770cf8..e1b7207b2f9 100644 --- a/examples/deployment/03-envoy-deployment.yaml +++ b/examples/deployment/03-envoy-deployment.yaml @@ -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: @@ -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 diff --git a/examples/gateway-provisioner/03-gateway-provisioner.yaml b/examples/gateway-provisioner/03-gateway-provisioner.yaml index ba5a3cfc2e4..bd699fc14d4 100644 --- a/examples/gateway-provisioner/03-gateway-provisioner.yaml +++ b/examples/gateway-provisioner/03-gateway-provisioner.yaml @@ -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: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 1e085adae27..708ab3b6aa7 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -8923,10 +8923,9 @@ 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: @@ -8934,8 +8933,8 @@ spec: 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 @@ -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 @@ -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: @@ -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 diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml index b3633a2e0cd..c869b73f8f7 100644 --- a/examples/render/contour-gateway-provisioner.yaml +++ b/examples/render/contour-gateway-provisioner.yaml @@ -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: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 0db31e989d5..415afdeeb55 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -8739,10 +8739,9 @@ 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: @@ -8750,8 +8749,8 @@ spec: 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 @@ -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 @@ -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: @@ -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 diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index d78bac68c7b..160e3b23fa4 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -8923,10 +8923,9 @@ 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: @@ -8934,8 +8933,8 @@ spec: 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 @@ -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 @@ -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: @@ -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