Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kubernetes: update to v1.15.10 #749

Merged
merged 1 commit into from
Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/kubernetes/0002-do-not-omit-debug-info.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index a82880a5..5454e73f 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -779,7 +779,7 @@ kube::golang::build_binaries() {
host_platform=$(kube::golang::host_platform)

local goflags goldflags goasmflags gogcflags
- goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
@@ -790,7 +790,7 @@ kube::golang::build_binaries() {
# Disable SC2153 for this, as it will throw a warning that the local
webern marked this conversation as resolved.
Show resolved Hide resolved
# variable goldflags will exist, and it suggest changing it to this.
# shellcheck disable=SC2153
- goldflags="${GOLDFLAGS=-s -w} $(kube::version::ldflags)"
+ goldflags="${GOLDFLAGS:-} $(kube::version::ldflags)"
goasmflags="-trimpath=${KUBE_ROOT}"
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 5454e73f..a146fc28 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -709,6 +709,7 @@ kube::golang::build_binaries_for_platform() {
@@ -715,6 +715,7 @@ kube::golang::build_binaries_for_platform() {

if [[ "${#nonstatics[@]}" != 0 ]]; then
build_args=(
Expand Down
Loading