mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	No need to pass GOFLAGS to $goflags variables.
In go 1.11, go commands will use `GOFLAGS` as default flags, see https://golang.org/doc/go1.11#go_command. There is no need to pass GOFLAGS to $goflags, and if we do, go commands will fail with "duplicate flags" error, e.g. ``` $ make test-integration WHAT=./test/integration/scheduler GOFLAGS="-v" ... go test: v flag may be set only once run "go help test" or "go help testflag" for more information ... ```
This commit is contained in:
		@@ -677,9 +677,7 @@ kube::golang::build_binaries() {
 | 
				
			|||||||
    local host_platform
 | 
					    local host_platform
 | 
				
			||||||
    host_platform=$(kube::golang::host_platform)
 | 
					    host_platform=$(kube::golang::host_platform)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Use eval to preserve embedded quoted strings.
 | 
					 | 
				
			||||||
    local goflags goldflags goasmflags gogcflags
 | 
					    local goflags goldflags goasmflags gogcflags
 | 
				
			||||||
    eval "goflags=(${GOFLAGS:-})"
 | 
					 | 
				
			||||||
    goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
 | 
					    goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
 | 
				
			||||||
    goasmflags="-trimpath=${KUBE_ROOT}"
 | 
					    goasmflags="-trimpath=${KUBE_ROOT}"
 | 
				
			||||||
    gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
 | 
					    gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -171,7 +171,6 @@ done
 | 
				
			|||||||
shift $((OPTIND - 1))
 | 
					shift $((OPTIND - 1))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Use eval to preserve embedded quoted strings.
 | 
					# Use eval to preserve embedded quoted strings.
 | 
				
			||||||
eval "goflags=(${GOFLAGS:-})"
 | 
					 | 
				
			||||||
eval "testargs=(${KUBE_TEST_ARGS:-})"
 | 
					eval "testargs=(${KUBE_TEST_ARGS:-})"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Used to filter verbose test output.
 | 
					# Used to filter verbose test output.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,9 +35,6 @@ fi
 | 
				
			|||||||
# See https://github.com/golang/go/issues/16086 for details.
 | 
					# See https://github.com/golang/go/issues/16086 for details.
 | 
				
			||||||
go install ./cmd/...
 | 
					go install ./cmd/...
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Use eval to preserve embedded quoted strings.
 | 
					 | 
				
			||||||
eval "goflags=(${GOFLAGS:-})"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Filter out arguments that start with "-" and move them to goflags.
 | 
					# Filter out arguments that start with "-" and move them to goflags.
 | 
				
			||||||
targets=()
 | 
					targets=()
 | 
				
			||||||
for arg; do
 | 
					for arg; do
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user