
This makes "new" and "old" setup_env functions. In subsequent commits,
all callers of the "old" form will be fixed, and the "new" will be
renamed back.
The old and new functions diff:
```diff
--- /tmp/a 2023-12-14 09:02:57.804092696 -0800
+++ /tmp/b 2023-12-14 09:03:09.679999585 -0800
@@ -1,4 +1,4 @@
-kube::golang::old::setup_env() {
+kube::golang:🆕:setup_env() {
kube::golang::verify_go_version
# Set up GOPATH. We have tools which depend on being in a GOPATH (see
@@ -7,9 +7,9 @@
# Even in module mode, we need to set GOPATH for `go build` and `go install`
# to work. We build various tools (usually via `go install`) from a lot of
# scripts.
- # * We can't set GOBIN because that does not work on cross-compiles.
- # * We could use `go build -o <something>`, but it's subtle when it comes
- # to cross-compiles and whether the <something> is a file or a directory,
+ # * We can't just set GOBIN because that does not work on cross-compiles.
+ # * We could always use `go build -o <something>`, but it's subtle wrt
+ # cross-compiles and whether the <something> is a file or a directory,
# and EVERY caller has to get it *just* right.
# * We could leave GOPATH alone and let `go install` write binaries
# wherever the user's GOPATH says (or doesn't say).
@@ -20,16 +20,6 @@
#
# Eventually, when we no longer rely on run-in-gopath.sh we may be able to
# simplify this some.
- local go_pkg_dir="${KUBE_GOPATH}/src/${KUBE_GO_PACKAGE}"
- local go_pkg_basedir
- go_pkg_basedir=$(dirname "${go_pkg_dir}")
-
- mkdir -p "${go_pkg_basedir}"
-
- # TODO: This symlink should be relative.
- if [[ ! -e "${go_pkg_dir}" || "$(readlink "${go_pkg_dir}")" != "${KUBE_ROOT}" ]]; then
- ln -snf "${KUBE_ROOT}" "${go_pkg_dir}"
- fi
export GOPATH="${KUBE_GOPATH}"
# If these are not set, set them now. This ensures that any subsequent
@@ -40,24 +30,10 @@
# Make sure our own Go binaries are in PATH.
export PATH="${KUBE_GOPATH}/bin:${PATH}"
- # Change directories so that we are within the GOPATH. Some tools get really
- # upset if this is not true. We use a whole fake GOPATH here to collect the
- # resultant binaries.
- local subdir
- subdir=$(kube::realpath . | sed "s|${KUBE_ROOT}||")
- cd "${KUBE_GOPATH}/src/${KUBE_GO_PACKAGE}/${subdir}" || return 1
-
- # Set GOROOT so binaries that parse code can work properly.
- GOROOT=$(go env GOROOT)
- export GOROOT
-
# Unset GOBIN in case it already exists in the current session.
# Cross-compiles will not work with it set.
unset GOBIN
- # This seems to matter to some tools
- export GO15VENDOREXPERIMENT=1
-
- # Disable workspaces
- export GOWORK=off
+ # Explicitly turn on modules.
+ export GO111MODULE=on
}
```
Result: `make` works for k/k:
```
$ make kubectl
+++ [1211 11:07:31] Building go targets for linux/amd64
k8s.io/kubernetes/cmd/kubectl (static)
$ make WHAT=./cmd/kubectl/
+++ [1211 11:08:19] Building go targets for linux/amd64
k8s.io/kubernetes/./cmd/kubectl/ (non-static)
$ make WHAT=k8s.io/kubernetes/cmd/kubectl
+++ [1211 11:08:52] Building go targets for linux/amd64
k8s.io/kubernetes/cmd/kubectl (static)
```
Result: `make` works for staging by package:
```
$ make WHAT=k8s.io/api
+++ [1211 11:11:37] Building go targets for linux/amd64
k8s.io/api (non-static)
```
Result: `make` fails for staging by path:
```
$ make WHAT=./staging/src/k8s.io/api
+++ [1211 11:12:44] Building go targets for linux/amd64
k8s.io/kubernetes/./staging/src/k8s.io/api (non-static)
cannot find module providing package k8s.io/kubernetes/staging/src/k8s.io/api: import lookup disabled by -mod=vendor
(Go version in go.work is at least 1.14 and vendor directory exists.)
!!! [1211 11:12:44] Call tree:
!!! [1211 11:12:44] 1: /home/thockin/src/kubernetes/hack/lib/golang.sh:850 kube::golang::build_some_binaries(...)
!!! [1211 11:12:44] 2: /home/thockin/src/kubernetes/hack/lib/golang.sh:1012 kube::golang::build_binaries_for_platform(...)
!!! [1211 11:12:44] 3: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
!!! [1211 11:12:44] Call tree:
!!! [1211 11:12:44] 1: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
!!! [1211 11:12:44] Call tree:
!!! [1211 11:12:44] 1: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
make: *** [Makefile:96: all] Error 1
```
Result: `make test` fails:
```
$ make test WHAT=./cmd/kubectl
+++ [1211 11:13:38] Set GOMAXPROCS automatically to 6
+++ [1211 11:13:38] Running tests without code coverage and with -race
cmd/kubectl/kubectl.go:25:2: cannot find package "k8s.io/client-go/plugin/pkg/client/auth" in any of:
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/client-go/plugin/pkg/client/auth (vendor tree)
/home/thockin/sdk/gotip/src/k8s.io/client-go/plugin/pkg/client/auth (from $GOROOT)
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/client-go/plugin/pkg/client/auth (from $GOPATH)
cmd/kubectl/kubectl.go:20:2: cannot find package "k8s.io/component-base/cli" in any of:
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/component-base/cli (vendor tree)
/home/thockin/sdk/gotip/src/k8s.io/component-base/cli (from $GOROOT)
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/component-base/cli (from $GOPATH)
cmd/kubectl/kubectl.go:21:2: cannot find package "k8s.io/kubectl/pkg/cmd" in any of:
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd (vendor tree)
/home/thockin/sdk/gotip/src/k8s.io/kubectl/pkg/cmd (from $GOROOT)
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubectl/pkg/cmd (from $GOPATH)
cmd/kubectl/kubectl.go:22:2: cannot find package "k8s.io/kubectl/pkg/cmd/util" in any of:
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/util (vendor tree)
/home/thockin/sdk/gotip/src/k8s.io/kubectl/pkg/cmd/util (from $GOROOT)
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubectl/pkg/cmd/util (from $GOPATH)
make: *** [Makefile:191: test] Error 1
```
146 lines
5.1 KiB
Bash
146 lines
5.1 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
# Copyright 2017 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
set -o errexit
|
|
set -o nounset
|
|
set -o pipefail
|
|
|
|
# Short-circuit if protoc.sh has already been sourced
|
|
[[ $(type -t kube::protoc::loaded) == function ]] && return 0
|
|
|
|
# The root of the build/dist directory
|
|
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
|
|
source "${KUBE_ROOT}/hack/lib/init.sh"
|
|
|
|
PROTOC_VERSION=23.4
|
|
|
|
# Generates $1/api.pb.go from the protobuf file $1/api.proto
|
|
# and formats it correctly
|
|
# $1: Full path to the directory where the api.proto file is
|
|
function kube::protoc::generate_proto() {
|
|
kube::golang::old::setup_env
|
|
GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
|
|
|
|
kube::protoc::check_protoc
|
|
|
|
local package=${1}
|
|
kube::protoc::protoc "${package}"
|
|
kube::protoc::format "${package}"
|
|
}
|
|
|
|
# Checks that the current protoc version matches the required version and
|
|
# exit 1 if it's not the case
|
|
function kube::protoc::check_protoc() {
|
|
if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc ${PROTOC_VERSION}"* ]]; then
|
|
echo "Generating protobuf requires protoc ${PROTOC_VERSION}."
|
|
echo "Run hack/install-protoc.sh or download and install the"
|
|
echo "platform-appropriate Protobuf package for your OS from"
|
|
echo "https://github.com/protocolbuffers/protobuf/releases"
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
# Generates $1/api.pb.go from the protobuf file $1/api.proto
|
|
# $1: Full path to the directory where the api.proto file is
|
|
function kube::protoc::protoc() {
|
|
local package=${1}
|
|
gogopath=$(dirname "$(kube::util::find-binary "protoc-gen-gogo")")
|
|
|
|
(
|
|
cd "${package}"
|
|
|
|
# This invocation of --gogo_out produces its output in the current
|
|
# directory (despite gogo docs saying it would be source-relative, it
|
|
# isn't). The inputs to this function do not all have a common root, so
|
|
# this works best for all inputs.
|
|
PATH="${gogopath}:${PATH}" protoc \
|
|
--proto_path="$(pwd -P)" \
|
|
--proto_path="${KUBE_ROOT}/vendor" \
|
|
--proto_path="${KUBE_ROOT}/third_party/protobuf" \
|
|
--gogo_out=paths=source_relative,plugins=grpc:. \
|
|
api.proto
|
|
)
|
|
}
|
|
|
|
# Formats $1/api.pb.go, adds the boilerplate comments and run gofmt on it
|
|
# $1: Full path to the directory where the api.proto file is
|
|
function kube::protoc::format() {
|
|
local package=${1}
|
|
|
|
# Update boilerplate for the generated file.
|
|
cat hack/boilerplate/boilerplate.generatego.txt "${package}/api.pb.go" > tmpfile && mv tmpfile "${package}/api.pb.go"
|
|
|
|
# Run gofmt to clean up the generated code.
|
|
kube::golang::verify_go_version
|
|
gofmt -s -w "${package}/api.pb.go"
|
|
}
|
|
|
|
# Compares the contents of $1 and $2
|
|
# Echo's $3 in case of error and exits 1
|
|
function kube::protoc::diff() {
|
|
local ret=0
|
|
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr "${1}" "${2}" || ret=$?
|
|
if [[ ${ret} -ne 0 ]]; then
|
|
echo "${3}"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function kube::protoc::install() {
|
|
# run in a subshell to isolate caller from directory changes
|
|
(
|
|
local os
|
|
local arch
|
|
local download_folder
|
|
local download_file
|
|
|
|
os=$(kube::util::host_os)
|
|
arch=$(kube::util::host_arch)
|
|
download_folder="protoc-v${PROTOC_VERSION}-${os}-${arch}"
|
|
download_file="${download_folder}.zip"
|
|
|
|
cd "${KUBE_ROOT}/third_party" || return 1
|
|
if [[ $(readlink protoc) != "${download_folder}" ]]; then
|
|
local url
|
|
if [[ ${os} == "darwin" ]]; then
|
|
# TODO: switch to universal binary when updating to 3.20+
|
|
url="https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-osx-x86_64.zip"
|
|
elif [[ ${os} == "linux" && ${arch} == "amd64" ]]; then
|
|
url="https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip"
|
|
elif [[ ${os} == "linux" && ${arch} == "arm64" ]]; then
|
|
url="https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-aarch_64.zip"
|
|
else
|
|
kube::log::info "This install script does not support ${os}/${arch}"
|
|
return 1
|
|
fi
|
|
kube::util::download_file "${url}" "${download_file}"
|
|
unzip -o "${download_file}" -d "${download_folder}"
|
|
ln -fns "${download_folder}" protoc
|
|
mv protoc/bin/protoc protoc/protoc
|
|
chmod -R +rX protoc/protoc
|
|
rm -fr protoc/include
|
|
rm "${download_file}"
|
|
fi
|
|
kube::log::info "protoc v${PROTOC_VERSION} installed. To use:"
|
|
kube::log::info "export PATH=\"$(pwd)/protoc:\${PATH}\""
|
|
)
|
|
}
|
|
|
|
# Marker function to indicate protoc.sh has been fully sourced
|
|
kube::protoc::loaded() {
|
|
return 0
|
|
}
|