From 746ec78ebf0546dc73eb0d6e434f4e2ebe12ad30 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Fri, 23 Apr 2021 10:21:00 +0200
Subject: [PATCH] Stop unsetting the golang buildid

Golang fixed the issue with the non-reproducible buildid already in
v1.15.3:

https://github.com/golang/go/commit/c5f692021279ee4c6426130f4525d8053fffcbcf
https://github.com/golang/go/commit/a3e965ce8addeb6a0b690069522a0487f68ee316

This means we can now use the internal buildid instead of the unset one.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 hack/lib/golang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 30484b5288c..5029bc18e67 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -794,7 +794,7 @@ kube::golang::build_binaries() {
     # Disable SC2153 for this, as it will throw a warning that the local
     # variable goldflags will exist, and it suggest changing it to this.
     # shellcheck disable=SC2153
-    goldflags="${GOLDFLAGS=-s -w -buildid=} $(kube::version::ldflags)"
+    goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
     goasmflags="-trimpath=${KUBE_ROOT}"
     gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"