*: Add initial 1.24 tool support #10707
Conversation
timflannagan
force-pushed
the
chore/1.24-tool-support
branch
3 times, most recently
from
dd48d1f to
10fcc29
Compare
Signed-off-by: timflannagan <[email protected]>
timflannagan
force-pushed
the
chore/1.24-tool-support
branch
from
10fcc29 to
a2f6369
Compare
Signed-off-by: timflannagan <[email protected]>
| @@ -48,8 +47,8 @@ runs: | |||
| IMAGE_VARIANT: ${{ matrix.image-variant }} | |||
| CONFORMANCE: "true" | |||
| CONFORMANCE_VERSION: ${{ env.CONFORMANCE_VERSION }} | |||
|
|
|||
| run: ./hack/kind/setup-kind.sh | |||
| run: make tool/kind && ./hack/kind/setup-kind.sh | |||
There was a problem hiding this comment.
Need to open an issue for this. We should be using a makefile target instead of calling bash scripts directly for the majority of our jobs.
| .PHONY: generate-crd-reference-docs | ||
| generate-crd-reference-docs: | ||
| go run docs/content/crds/generate.go |
There was a problem hiding this comment.
Removed the generate-crd-reference-docs as it's currently broken. See #10568.
| .PHONY: generate-crd-reference-docs | ||
| generate-crd-reference-docs: | ||
| go run docs/content/crds/generate.go | ||
| getter-check: tool/gettercheck ## Runs all generate directives for mockgen in the repo |
There was a problem hiding this comment.
Unclear whether we wanted to migrate this tool, but I thought there was an open issue for removing it or replacing it with the protogetter golangci-lint linter. I can create that issue if we don't want to rip out this tool here.
| @@ -573,14 +621,16 @@ endif # distroless images | |||
| CLUSTER_NAME ?= kind | |||
| INSTALL_NAMESPACE ?= kgateway-system | |||
|
|
|||
| kind-setup: | |||
| KIND ?= go tool sigs.k8s.io/kind | |||
There was a problem hiding this comment.
Added kind as a tool as we rely on it for a portion of the testing matrix. I realize we may want to add envtest as a tool too...
| kubectl rollout status -n metallb-system deployment/controller --timeout 2m | ||
| kubectl rollout status -n metallb-system daemonset/speaker --timeout 2m | ||
| kubectl rollout status -n metallb-system deployment/controller --timeout 5m | ||
| kubectl rollout status -n metallb-system daemonset/speaker --timeout 5m |
There was a problem hiding this comment.
We were seeing timeouts in a couple of recent PR runs. Wasn't able to reproduce locally.
| sigs.k8s.io/gateway-api v1.2.1 | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.5.0 | ||
| sigs.k8s.io/yaml v1.4.0 | ||
| ) | ||
|
|
||
| require ( | ||
| 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect |
There was a problem hiding this comment.
this adds a lot of new deps to go.mod.
should we consider creating a separate go.mod just for the tools?
There was a problem hiding this comment.
These additions shouldn't interfere with deps for the main module according to go docs on the tool feature
|
should we use the tools.go thing introduced in 1.24? https://pkg.go.dev/golang.org/x/tools |
| # Tools | ||
| #---------------------------------------------------------------------------- | ||
|
|
||
| .PHONY: tools |
There was a problem hiding this comment.
I think tools are saved in the go.mod, so we shouldn't need them in the makefile
| #---------------------------------------------------------------------------------- | ||
| # Repo setup | ||
| #---------------------------------------------------------------------------------- | ||
|
|
||
| GOIMPORTS ?= go tool golang.org/x/tools/cmd/goimports |
There was a problem hiding this comment.
Nit: you can use short form go tool goimports
@yuval-k We moved the ci/ directory to hack/ a couple of weeks back if you're looking at you're looking at an older branch. The hacks/tools.go file was removed with these changes |
timflannagan
added
the
work in progress
|
Adding the WIP label. I'll get back to this sometime this week. |
Description
Closes #10645.
Checklist: