[release-1.8] Update images tags after adding git data in gcloud (#10233)

* fix gcloud builds

Signed-off-by: James Strong <[email protected]>

* update reg

Signed-off-by: James Strong <[email protected]>

---------

Signed-off-by: James Strong <[email protected]>
Co-authored-by: James Strong <[email protected]>

Author: k8s-infra-cherrypick-robot

images/cfssl/Makefile

@@ -23,8 +23,6 @@ TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
 
 REGISTRY ?= local
 
-
-
 IMAGE = $(REGISTRY)/e2e-test-cfssl
 
 # required to enable buildx

images/cfssl/cloudbuild.yaml

@@ -6,8 +6,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -17,6 +15,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/cfssl && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/custom-error-pages/cloudbuild.yaml

@@ -6,8 +6,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -17,6 +15,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/custom-error-pages && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/echo/cloudbuild.yaml

@@ -6,8 +6,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -17,6 +15,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/echo && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/ext-auth-example-authsvc/Makefile

@@ -18,7 +18,9 @@ SHELL=/bin/bash -o pipefail -o errexit
 DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 INIT_BUILDX=$(DIR)/../../hack/init-buildx.sh
 
-TAG ?=v1.0.0
+SHORT_SHA ?=$(shell git rev-parse --short HEAD)
+TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
+
 REGISTRY ?= local
 
 IMAGE = $(REGISTRY)/ext-auth-example-authsvc

images/ext-auth-example-authsvc/cloudbuild.yaml

@@ -8,8 +8,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -19,6 +17,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/ext-auth-example-authsvc && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/fastcgi-helloserver/cloudbuild.yaml

@@ -6,8 +6,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -17,6 +15,4 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/fastcgi-helloserver && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"
+

images/go-grpc-greeter-server/cloudbuild.yaml

@@ -8,8 +8,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -19,6 +17,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/go-grpc-greeter-server && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/httpbun/cloudbuild.yaml

@@ -8,8 +8,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -19,6 +17,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/httpbun && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "master"

images/kube-webhook-certgen/cloudbuild.yaml

@@ -21,8 +21,6 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - SHORT_SHA=$SHORT_SHA
-      - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
       # set the home to /root explicitly to if using docker buildx
@@ -32,6 +30,3 @@ steps:
     - |
       gcloud auth configure-docker \
       && cd images/kube-webhook-certgen && make push
-substitutions:
-  _GIT_TAG: "12345"
-  _PULL_BASE_REF: "main"