github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78048 from cblecker/fix-bash-build

Browse Source 
Don't use declare -g in build
This commit is contained in:
Kubernetes Prow Robot 2019-05-17 23:21:49 -07:00 committed by GitHub
commit a67f128f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/lib/golang.sh
View File

@ -163,10 +163,10 @@ kube::golang::dedup() {
# to readonly. # to readonly.
# The configured vars will only contain platforms allowed by the # The configured vars will only contain platforms allowed by the
# KUBE_SUPPORTED* vars at the top of this file. # KUBE_SUPPORTED* vars at the top of this file.
declare -a -g KUBE_SERVER_PLATFORMS declare -a KUBE_SERVER_PLATFORMS
declare -a -g KUBE_CLIENT_PLATFORMS declare -a KUBE_CLIENT_PLATFORMS
declare -a -g KUBE_NODE_PLATFORMS declare -a KUBE_NODE_PLATFORMS
declare -a -g KUBE_TEST_PLATFORMS declare -a KUBE_TEST_PLATFORMS
kube::golang::setup_platforms() { kube::golang::setup_platforms() {
if [[ -n "${KUBE_BUILD_PLATFORMS:-}" ]]; then if [[ -n "${KUBE_BUILD_PLATFORMS:-}" ]]; then
# KUBE_BUILD_PLATFORMS needs to be read into an array before the next # KUBE_BUILD_PLATFORMS needs to be read into an array before the next
@ -219,7 +219,7 @@ kube::golang::setup_platforms() {
KUBE_CLIENT_PLATFORMS=( KUBE_CLIENT_PLATFORMS=(
darwin/amd64 darwin/amd64
linux/amd64 linux/amd64
) )
readonly KUBE_CLIENT_PLATFORMS readonly KUBE_CLIENT_PLATFORMS
else else
KUBE_TEST_PLATFORMS=(linux/amd64) KUBE_TEST_PLATFORMS=(linux/amd64)