mirror of
https://github.com/kubernetes/kubernetes.git
synced 2025-02-06 09:27:50 +00:00
65b841c077
This creates go.work and enables Go Workspaces. This is a file that
includes info on k/k and all the staging modules.
This depends on go 1.22 and setting FORCE_HOST_GO=true (for kube
scripts, which try to be hermetic).
Make this part of the normal update/verify sequence.
The top-level go.work file contains no replace statements. Instead, the
replace statements in the individual go.mod files are used. For this to
work, replace statements in the individual go.mod files have to be
consistent.
hack/tools has different dependencies and can't be in the main
workspace, so this adds a go.work just for that. Without this, go tries
to consider all deps in all modules and pick one that works for all.
This is problematic because there are so many of them that it is
difficult to manage.
Likewise for k8s.io/code-generator/examples and
k8s.io/kms/internal/plugins/_mock - add trivial go.work files.
For example k/k depends on an older version of a lib that gloangci-lint
needs (transitively) and it breaks.
This also updates vendor (needed to make go happy), and removes
vendor'ed symlinks. This breaks a LOT of our build tools, which will be
fixed subsequently.
Result: `go` commands work across modules:
Before:
```
$ go list ./pkg/proxy/iptables/ ./staging/src/k8s.io/api/core/v1/
main module (k8s.io/kubernetes) does not contain package k8s.io/kubernetes/staging/src/k8s.io/api/core/v1
$ go build ./pkg/proxy/iptables/ ./staging/src/k8s.io/api
main module (k8s.io/kubernetes) does not contain package k8s.io/kubernetes/staging/src/k8s.io/api
$ go test ./pkg/proxy/iptables/ ./staging/src/k8s.io/api
main module (k8s.io/kubernetes) does not contain package k8s.io/kubernetes/staging/src/k8s.io/api
```
After:
```
$ go list ./pkg/proxy/iptables/ ./staging/src/k8s.io/api/core/v1/
k8s.io/kubernetes/pkg/proxy/iptables
k8s.io/api/core/v1
$ go build ./pkg/proxy/iptables/ ./staging/src/k8s.io/api
$ go test ./pkg/proxy/iptables/ ./staging/src/k8s.io/api
ok k8s.io/kubernetes/pkg/proxy/iptables 0.360s
ok k8s.io/api 2.302s
```
Result: `make` fails:
```
$ make
go version go1.22rc1 linux/amd64
+++ [0106 12:11:03] Building go targets for linux/amd64
k8s.io/kubernetes/cmd/kube-proxy (static)
k8s.io/kubernetes/cmd/kube-apiserver (static)
k8s.io/kubernetes/cmd/kube-controller-manager (static)
k8s.io/kubernetes/cmd/kubelet (non-static)
k8s.io/kubernetes/cmd/kubeadm (static)
k8s.io/kubernetes/cmd/kube-scheduler (static)
k8s.io/component-base/logs/kube-log-runner (static)
k8s.io/kube-aggregator (static)
k8s.io/apiextensions-apiserver (static)
k8s.io/kubernetes/cluster/gce/gci/mounter (static)
k8s.io/kubernetes/cmd/kubectl (static)
k8s.io/kubernetes/cmd/kubectl-convert (static)
github.com/onsi/ginkgo/v2/ginkgo (non-static)
k8s.io/kubernetes/test/e2e/e2e.test (test)
k8s.io/kubernetes/test/conformance/image/go-runner (non-static)
k8s.io/kubernetes/cmd/kubemark (static)
github.com/onsi/ginkgo/v2/ginkgo (non-static)
k8s.io/kubernetes/test/e2e_node/e2e_node.test (test)
test/e2e/e2e.go:35:2: cannot find package "k8s.io/api/apps/v1" in any of:
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/kubernetes/vendor/k8s.io/api/apps/v1 (vendor tree)
/home/thockin/src/kubernetes/_output/local/.gimme/versions/go1.22rc1.linux.amd64/src/k8s.io/api/apps/v1 (from $GOROOT)
/home/thockin/src/kubernetes/_output/local/go/src/k8s.io/api/apps/v1 (from $GOPATH)
... more ...
... more ...
... more ...
!!! [0106 12:13:41] Call tree:
!!! [0106 12:13:41] 1: /home/thockin/src/kubernetes/hack/lib/golang.sh:948 kube::golang::build_binaries_for_platform(...)
!!! [0106 12:13:41] 2: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
!!! [0106 12:13:41] Call tree:
!!! [0106 12:13:41] 1: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
!!! [0106 12:13:41] Call tree:
!!! [0106 12:13:41] 1: hack/make-rules/build.sh:27 kube::golang::build_binaries(...)
make: *** [Makefile:96: all] Error 1
```
Again, this requires go 1.22 (e.g. gotip), as go 1.21.x does not have
`go work vendor` support.
TO REPEAT:
( \
./hack/update-go-workspace.sh; \
./hack/update-vendor.sh; \
./hack/update-go-workspace.sh; \
)
127 lines
2.1 KiB
Plaintext
127 lines
2.1 KiB
Plaintext
# OSX leaves these everywhere on SMB shares
|
|
._*
|
|
|
|
# OSX trash
|
|
.DS_Store
|
|
|
|
# Developers can store local stuff in dirs named __something
|
|
__*
|
|
|
|
# Eclipse files
|
|
.classpath
|
|
.project
|
|
.settings/**
|
|
|
|
# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
|
|
.idea/
|
|
*.iml
|
|
|
|
# Vscode files
|
|
.vscode
|
|
|
|
# This is where the result of the go build goes
|
|
/output*/
|
|
/_output*/
|
|
/_output
|
|
|
|
# Emacs save files
|
|
*~
|
|
\#*\#
|
|
.\#*
|
|
|
|
# Vim-related files
|
|
[._]*.s[a-w][a-z]
|
|
[._]s[a-w][a-z]
|
|
*.un~
|
|
Session.vim
|
|
.netrwhist
|
|
|
|
# cscope-related files
|
|
cscope.*
|
|
|
|
# Go test binaries
|
|
*.test
|
|
/hack/.test-cmd-auth
|
|
|
|
# JUnit test output from ginkgo e2e tests
|
|
/junit*.xml
|
|
|
|
# Mercurial files
|
|
**/.hg
|
|
**/.hg*
|
|
|
|
# Vagrant
|
|
.vagrant
|
|
network_closure.sh
|
|
|
|
# Local cluster env variables
|
|
/cluster/env.sh
|
|
|
|
# Compiled binaries in third_party
|
|
/third_party/pkg
|
|
|
|
# Also ignore etcd installed by hack/install-etcd.sh
|
|
/third_party/etcd*
|
|
/default.etcd
|
|
|
|
# Also ignore protoc installed by hack/install-protoc.sh
|
|
/third_party/protoc*
|
|
|
|
# User cluster configs
|
|
.kubeconfig
|
|
|
|
.tags*
|
|
|
|
# Version file for dockerized build
|
|
.dockerized-kube-version-defs
|
|
|
|
# Web UI
|
|
/www/master/node_modules/
|
|
/www/master/npm-debug.log
|
|
/www/master/shared/config/development.json
|
|
|
|
# Karma output
|
|
/www/test_out
|
|
|
|
# precommit temporary directories created by ./hack/verify-generated-docs.sh and ./hack/lib/util.sh
|
|
/_tmp/
|
|
/doc_tmp/
|
|
|
|
# Test artifacts produced by Prow/kubetest2 jobs
|
|
/_artifacts/
|
|
/_rundir/
|
|
|
|
# Go dependencies installed on Jenkins
|
|
/_gopath/
|
|
|
|
# Config directories created by gcloud and gsutil on Jenkins
|
|
/.config/gcloud*/
|
|
/.gsutil/
|
|
|
|
# CoreOS stuff
|
|
/cluster/libvirt-coreos/coreos_*.img
|
|
|
|
# Downloaded Kubernetes binary release
|
|
/kubernetes/
|
|
|
|
# direnv .envrc files
|
|
.envrc
|
|
|
|
# Downloaded kubernetes binary release tar ball
|
|
kubernetes.tar.gz
|
|
|
|
# Phony test files used as part of coverage generation
|
|
zz_generated_*_test.go
|
|
|
|
# Just in time generated data in the source, should never be committed
|
|
/test/e2e/generated/bindata.go
|
|
|
|
# This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored
|
|
!\.drone\.sec
|
|
|
|
/bazel-*
|
|
*.pyc
|
|
|
|
# generated by verify-vendor.sh
|
|
vendordiff.patch
|