From 11d3f44d7da454a63efde21fa5aa85fbc3244382 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Thu, 9 Jul 2020 17:14:14 -0400
Subject: [PATCH] Fix version GIT_COMMIT reference

---
 cloudbuild.yaml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index d4d1c3578..89b2135d4 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,8 +1,6 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 
 timeout: 1800s
-# this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
-# or any new substitutions added in the future.
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -10,8 +8,7 @@ steps:
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - TAG=$_GIT_TAG
-      - BASE_REF=$_PULL_BASE_REF
+      - GIT_COMMIT=$_GIT_TAG
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       - REPO_INFO=https://github.com/kubernetes/ingress-nginx
       - HOME=/root
@@ -22,9 +19,5 @@ steps:
       gcloud auth configure-docker \
       && make release
 substitutions:
-  # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
-  # can be used as a substitution
   _GIT_TAG: "12345"
-  # _PULL_BASE_REF will contain the ref that was pushed to to trigger this build -
-  # a branch like 'master' or 'release-0.2', or a tag like 'v0.2'.
   _PULL_BASE_REF: "master"