diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2019-07-16 21:02:27 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-07-16 21:02:57 +0000 |
| commit | fd3cda9b3d8a977358542d1f20932c7122dc1de3 (patch) | |
| tree | 6ce22e1aafe2dbe805b12dffc88fbd61130b794e /testing/kubernetes/bindata.patch | |
| parent | efd78c8161460911e14880d8fcfb4b4cae3c8667 (diff) | |
| download | aports-fd3cda9b3d8a977358542d1f20932c7122dc1de3.tar.bz2 aports-fd3cda9b3d8a977358542d1f20932c7122dc1de3.tar.xz | |
testing/kubernetes: upgrade to 1.15.0
Diffstat (limited to 'testing/kubernetes/bindata.patch')
| -rw-r--r-- | testing/kubernetes/bindata.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/testing/kubernetes/bindata.patch b/testing/kubernetes/bindata.patch new file mode 100644 index 0000000000..19aa194d1b --- /dev/null +++ b/testing/kubernetes/bindata.patch @@ -0,0 +1,30 @@ +diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh +index 995f1d17..32d04188 100755 +--- a/hack/generate-bindata.sh ++++ b/hack/generate-bindata.sh +@@ -30,7 +30,6 @@ fi + + # kube::golang::build_kube_toolchain installs the vendored go-bindata in + # $GOPATH/bin, so make sure that's explicitly part of our $PATH. +-export PATH="${KUBE_OUTPUT_BINPATH}:${PATH}" + + if ! which go-bindata &>/dev/null ; then + echo "Cannot find go-bindata." +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index f20a55b3..ca6ae34d 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -778,11 +778,11 @@ kube::golang::build_binaries() { + host_platform=$(kube::golang::host_platform) + + local goflags goldflags goasmflags gogcflags +- # If GOLDFLAGS is unset, then set it to the a default of "-s -w". ++ # If GOLDFLAGS is unset, then set it to the a default of "-w". + # 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} $(kube::version::ldflags)" ++ goldflags="${GOLDFLAGS=-w} $(kube::version::ldflags)" + goasmflags="-trimpath=${KUBE_ROOT}" + gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}" + |