diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index ab3e2a5607e..4da0208b31d 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.28.0", envoyImage: "docker.io/envoyproxy/envoy:v1.29.1", metricsBindAddress: ":8080", leaderElection: false, diff --git a/examples/contour/02-job-certgen.yaml b/examples/contour/02-job-certgen.yaml index 35ba3d2fc7d..adeb337dd1e 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-28-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.28.0 + imagePullPolicy: IfNotPresent command: - contour - certgen diff --git a/examples/contour/03-contour.yaml b/examples/contour/03-contour.yaml index a49c3851e4a..6c5932f3115 100644 --- a/examples/contour/03-contour.yaml +++ b/examples/contour/03-contour.yaml @@ -45,8 +45,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.28.0 + imagePullPolicy: IfNotPresent name: contour ports: - containerPort: 8001 diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index cde50e56c24..9f6b0bb5cd3 100644 --- a/examples/contour/03-envoy.yaml +++ b/examples/contour/03-envoy.yaml @@ -29,8 +29,8 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.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.28.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 c7861ec5244..e2f404ac6d0 100644 --- a/examples/deployment/03-envoy-deployment.yaml +++ b/examples/deployment/03-envoy-deployment.yaml @@ -41,8 +41,8 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.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.28.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..0d2841bf591 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.28.0 + imagePullPolicy: IfNotPresent name: contour-gateway-provisioner resources: requests: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 790f7744634..7a76ab76e70 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -8803,10 +8803,9 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-main + name: contour-certgen-v1-28-0 namespace: projectcontour spec: - ttlSecondsAfterFinished: 0 template: metadata: labels: @@ -8814,8 +8813,8 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent command: - contour - certgen @@ -9076,8 +9075,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.28.0 + imagePullPolicy: IfNotPresent name: contour ports: - containerPort: 8001 @@ -9176,8 +9175,8 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent lifecycle: preStop: exec: @@ -9254,8 +9253,8 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.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 79a2d1a5830..343c41abbc2 100644 --- a/examples/render/contour-gateway-provisioner.yaml +++ b/examples/render/contour-gateway-provisioner.yaml @@ -20601,8 +20601,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.28.0 + imagePullPolicy: IfNotPresent name: contour-gateway-provisioner resources: requests: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 48672da8e17..8f0640c6a60 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -8806,10 +8806,9 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-main + name: contour-certgen-v1-28-0 namespace: projectcontour spec: - ttlSecondsAfterFinished: 0 template: metadata: labels: @@ -8817,8 +8816,8 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent command: - contour - certgen @@ -9079,8 +9078,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.28.0 + imagePullPolicy: IfNotPresent name: contour ports: - containerPort: 8001 @@ -9167,8 +9166,8 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent lifecycle: preStop: exec: @@ -9245,8 +9244,8 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: - name: envoy-config diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index e2ab3f43ff3..c458a55d599 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -8803,10 +8803,9 @@ rules: apiVersion: batch/v1 kind: Job metadata: - name: contour-certgen-main + name: contour-certgen-v1-28-0 namespace: projectcontour spec: - ttlSecondsAfterFinished: 0 template: metadata: labels: @@ -8814,8 +8813,8 @@ spec: spec: containers: - name: contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent command: - contour - certgen @@ -9076,8 +9075,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.28.0 + imagePullPolicy: IfNotPresent name: contour ports: - containerPort: 8001 @@ -9164,8 +9163,8 @@ spec: args: - envoy - shutdown-manager - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent lifecycle: preStop: exec: @@ -9242,8 +9241,8 @@ spec: - --envoy-key-file=/certs/tls.key command: - contour - image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + image: ghcr.io/projectcontour/contour:v1.28.0 + imagePullPolicy: IfNotPresent name: envoy-initconfig volumeMounts: - name: envoy-config