diff --git a/changelogs/unreleased/4402-rajatvig-small.md b/changelogs/unreleased/4402-rajatvig-small.md new file mode 100644 index 00000000000..4e11fe01fa7 --- /dev/null +++ b/changelogs/unreleased/4402-rajatvig-small.md @@ -0,0 +1 @@ +Removed the hack for ImagePullPolicy for certgen diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 63bac64116f..db363d1affd 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -4908,7 +4908,7 @@ spec: containers: - name: contour image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: - contour - certgen diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 66a9c847a6a..db1aaf6e847 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -4911,7 +4911,7 @@ spec: containers: - name: contour image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: - contour - certgen diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index 3661691e607..95f0d805311 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -4908,7 +4908,7 @@ spec: containers: - name: contour image: ghcr.io/projectcontour/contour:main - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: - contour - certgen diff --git a/hack/generate-deployment.sh b/hack/generate-deployment.sh index f0fcb20de3e..0dc6ad8d7e7 100755 --- a/hack/generate-deployment.sh +++ b/hack/generate-deployment.sh @@ -53,14 +53,9 @@ done echo -# certgen uses the ':latest' image tag, so it always needs to be pulled. Everything -# else correctly uses versioned image tags so we should use IfNotPresent. for y in $FILES ; do echo # Ensure we have at least one newline between joined fragments. case $y in - */02-job-certgen.yaml) - cat "$y" - ;; $SKIP_FILE) # skip this file ;; diff --git a/hack/generate-gateway-deployment.sh b/hack/generate-gateway-deployment.sh index e99f36cab95..a8043da81db 100755 --- a/hack/generate-gateway-deployment.sh +++ b/hack/generate-gateway-deployment.sh @@ -31,9 +31,6 @@ done echo -# certgen uses the ':latest' image tag, so it always needs to be pulled. Everything -# else correctly uses versioned image tags so we should use IfNotPresent and updates -# the Contour config for Gateway API. for y in "${REPO}/examples/contour/"*.yaml ; do echo # Ensure we have at least one newline between joined fragments. case $y in @@ -43,9 +40,6 @@ for y in "${REPO}/examples/contour/"*.yaml ; do */01-contour-config.yaml) sed 's|# gateway:|gateway:|g ; s|# controllerName: projectcontour.io/projectcontour/contour| controllerName: projectcontour.io/projectcontour/contour|g' < "$y" ;; - */02-job-certgen.yaml) - cat "$y" - ;; *) sed 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' < "$y" ;;