aboutsummaryrefslogtreecommitdiff
path: root/testing/kubernetes/bindata.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/kubernetes/bindata.patch')
-rw-r--r--testing/kubernetes/bindata.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/testing/kubernetes/bindata.patch b/testing/kubernetes/bindata.patch
deleted file mode 100644
index 19aa194d1b..0000000000
--- a/testing/kubernetes/bindata.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh
2index 995f1d17..32d04188 100755
3--- a/hack/generate-bindata.sh
4+++ b/hack/generate-bindata.sh
5@@ -30,7 +30,6 @@ fi
6
7 # kube::golang::build_kube_toolchain installs the vendored go-bindata in
8 # $GOPATH/bin, so make sure that's explicitly part of our $PATH.
9-export PATH="${KUBE_OUTPUT_BINPATH}:${PATH}"
10
11 if ! which go-bindata &>/dev/null ; then
12 echo "Cannot find go-bindata."
13diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
14index f20a55b3..ca6ae34d 100755
15--- a/hack/lib/golang.sh
16+++ b/hack/lib/golang.sh
17@@ -778,11 +778,11 @@ kube::golang::build_binaries() {
18 host_platform=$(kube::golang::host_platform)
19
20 local goflags goldflags goasmflags gogcflags
21- # If GOLDFLAGS is unset, then set it to the a default of "-s -w".
22+ # If GOLDFLAGS is unset, then set it to the a default of "-w".
23 # Disable SC2153 for this, as it will throw a warning that the local
24 # variable goldflags will exist, and it suggest changing it to this.
25 # shellcheck disable=SC2153
26- goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
27+ goldflags="${GOLDFLAGS=-w} $(kube::version::ldflags)"
28 goasmflags="-trimpath=${KUBE_ROOT}"
29 gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
30