From ac317a87ff3442c4cb60cebb970f9f91076c4a7a Mon Sep 17 00:00:00 2001
From: Steve Kriss <steve@heptio.com>
Date: Thu, 6 Dec 2018 13:21:05 -0700
Subject: [PATCH] show full git SHA in ark version output

Signed-off-by: Steve Kriss <steve@heptio.com>
---
 .goreleaser.yml          |  4 +---
 hack/build.sh            |  2 +-
 hack/goreleaser.sh       |  2 --
 hack/set-example-tags.sh | 13 +++++++------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 584342c5e..66c8ce230 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -39,7 +39,7 @@ builds:
       - goos: windows
         goarch: arm64
     ldflags:
-      - -X "github.com/heptio/ark/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/ark/pkg/buildinfo.GitSHA={{ .Env.GIT_SHA }}" -X "github.com/heptio/ark/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
+      - -X "github.com/heptio/ark/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/ark/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/heptio/ark/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
 archive:
   name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
   files:
@@ -47,8 +47,6 @@ archive:
     - config/**/*
 checksum:
   name_template: 'CHECKSUM'
-snapshot:
-  name_template: "{{ .Env.GIT_SHA }}"
 release:
   github:
     owner: heptio
diff --git a/hack/build.sh b/hack/build.sh
index fb9ec8b9c..bdbfcdb73 100755
--- a/hack/build.sh
+++ b/hack/build.sh
@@ -41,7 +41,7 @@ fi
 
 export CGO_ENABLED=0
 
-GIT_SHA=$(git describe --tags --always)
+GIT_SHA=$(git rev-parse HEAD)
 GIT_DIRTY=$(git status --porcelain 2> /dev/null)
 if [[ -z "${GIT_DIRTY}" ]]; then
   GIT_TREE_STATE=clean
diff --git a/hack/goreleaser.sh b/hack/goreleaser.sh
index b760895a0..95c61308e 100755
--- a/hack/goreleaser.sh
+++ b/hack/goreleaser.sh
@@ -29,8 +29,6 @@ if [ -z "${RELEASE_NOTES_FILE}" ]; then
     exit 1
 fi
 
-export GIT_SHA=$(git describe --tags --always)
-
 GIT_DIRTY=$(git status --porcelain 2> /dev/null)
 if [[ -z "${GIT_DIRTY}" ]]; then
     export GIT_TREE_STATE=clean
diff --git a/hack/set-example-tags.sh b/hack/set-example-tags.sh
index 38b302138..21ea2b6ed 100755
--- a/hack/set-example-tags.sh
+++ b/hack/set-example-tags.sh
@@ -18,19 +18,20 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
+GIT_TAG=$(git describe --tags --always)
+
 # this script copies all of the files under examples/ into a new directory,
-# config/ (which is gitignored so it doesn't result in the git
-# state being dirty, which would prevent goreleaser from running), and then
-# updates all of the image tags in those files to use $GIT_SHA (which will
-# be the release/tag name).
+# config/ (which is gitignored so it doesn't result in the git state being 
+# dirty, which would prevent goreleaser from running), and then updates all 
+# of the image tags in those files to use $GIT_TAG.
 
 rm -rf config/ && cp -r examples/ config/
 
 # the "-i'.bak'" flag to sed is necessary, with no space between the flag
 # and the value, for this to be compatible across BSD/OSX sed and GNU sed.
 # remove the ".bak" files afterwards (they're copies of the originals).
-find config/ -type f -name "*.yaml" | xargs sed -i'.bak' "s|gcr.io/heptio-images/ark:latest|gcr.io/heptio-images/ark:$GIT_SHA|g"
+find config/ -type f -name "*.yaml" | xargs sed -i'.bak' "s|gcr.io/heptio-images/ark:latest|gcr.io/heptio-images/ark:$GIT_TAG|g"
 find config/ -type f -name "*.bak" | xargs rm
 
-find config/ -type f -name "*.yaml" | xargs sed -i'.bak' "s|gcr.io/heptio-images/fsfreeze-pause:latest|gcr.io/heptio-images/fsfreeze-pause:$GIT_SHA|g"
+find config/ -type f -name "*.yaml" | xargs sed -i'.bak' "s|gcr.io/heptio-images/fsfreeze-pause:latest|gcr.io/heptio-images/fsfreeze-pause:$GIT_TAG|g"
 find config/ -type f -name "*.bak" | xargs rm