diff --git a/kyaml/Makefile b/kyaml/Makefile index c0caeafc8..61d3d0d13 100644 --- a/kyaml/Makefile +++ b/kyaml/Makefile @@ -1,7 +1,10 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -MYGOBIN := $(shell go env GOPATH)/bin +MYGOBIN = $(shell go env GOBIN) +ifeq ($(MYGOBIN),) +MYGOBIN = $(shell go env GOPATH)/bin +endif export PATH := $(MYGOBIN):$(PATH) .PHONY: generate license fix vet fmt test lint tidy clean diff --git a/kyaml/openapi/Makefile b/kyaml/openapi/Makefile index f5cd8dc67..945f1aa52 100644 --- a/kyaml/openapi/Makefile +++ b/kyaml/openapi/Makefile @@ -1,7 +1,10 @@ # Copyright 2020 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -MYGOBIN := $(shell go env GOPATH)/bin +MYGOBIN = $(shell go env GOBIN) +ifeq ($(MYGOBIN),) +MYGOBIN = $(shell go env GOPATH)/bin +endif API_VERSION := "v1.19.1" .PHONY: all diff --git a/kyaml/openapi/scripts/fetchSchemaFromCluster.sh b/kyaml/openapi/scripts/fetchSchemaFromCluster.sh index b2d3d64ef..1126d035c 100755 --- a/kyaml/openapi/scripts/fetchSchemaFromCluster.sh +++ b/kyaml/openapi/scripts/fetchSchemaFromCluster.sh @@ -2,7 +2,8 @@ # Copyright 2020 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -MYGOBIN=$(go env GOPATH)/bin +MYGOBIN=$(go env GOBIN) +MYGOBIN="${MYGOBIN:-$(go env GOPATH)/bin}" VERSION=$1 cp $HOME/.kube/config /tmp/kubeconfig.txt | true diff --git a/kyaml/openapi/scripts/generateSwaggerDotGo.sh b/kyaml/openapi/scripts/generateSwaggerDotGo.sh index 1c01f8630..e055c0727 100755 --- a/kyaml/openapi/scripts/generateSwaggerDotGo.sh +++ b/kyaml/openapi/scripts/generateSwaggerDotGo.sh @@ -2,7 +2,8 @@ # Copyright 2020 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -MYGOBIN=$(go env GOPATH)/bin +MYGOBIN=$(go env GOBIN) +MYGOBIN="${MYGOBIN:-$(go env GOPATH)/bin}" VERSION=$1 $MYGOBIN/go-bindata \