Remove the hack in scripts for certgen job (#4402)

Signed-off-by: Rajat Vig <rvig@etsy.com>
projectcontour · Mar 16, 2022 · 04be670 · 04be670
1 parent 584de27
commit 04be670
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 14 deletions.
diff --git a/changelogs/unreleased/4402-rajatvig-small.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
         ;;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Removed the hack for ImagePullPolicy for certgen