kubernetes: update to v1.15.10

bottlerocket-os · Feb 20, 2020 · 6698ce6 · 6698ce6
1 parent 8edecc0
commit 6698ce6
Show file tree

Hide file tree

Showing 5 changed files with 421 additions and 9 deletions.
diff --git a/packages/kubernetes/0002-do-not-omit-debug-info.patch b/packages/kubernetes/0002-do-not-omit-debug-info.patch
@@ -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
+     # 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}"

diff --git a/packages/kubernetes/0003-enable-PIE-for-platform-binaries.patch b/packages/kubernetes/0003-enable-PIE-for-platform-binaries.patch
@@ -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=(