Skip to content

Commit 1e9b1bb

Browse files
authored
Add explicit go dependencies on build tools (#187)
Make tool dependencies explicit go dependencies so they can be managed via go.mod and tracked by dependabot. Fixes #146.
1 parent d213ee1 commit 1e9b1bb

File tree

4 files changed

+175
-11
lines changed

4 files changed

+175
-11
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ GENREF = $(LOCALBIN)/genref-$(GENREF_VERSION)
208208

209209

210210
## Tool Versions
211-
KUSTOMIZE_VERSION ?= v5.3.0
212-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
211+
KUSTOMIZE_VERSION ?= $(shell go list -m -f '{{.Version}}' sigs.k8s.io/kustomize/kustomize/v5)
212+
CONTROLLER_TOOLS_VERSION ?= $(shell go list -m -f '{{.Version}}' sigs.k8s.io/controller-tools)
213213
ENVTEST_VERSION ?= latest
214-
GOLANGCI_LINT_VERSION ?= v1.55.2
214+
GOLANGCI_LINT_VERSION ?= $(shell go list -m -f '{{.Version}}' github.com/golangci/golangci-lint)
215215
GENREF_VERSION ?= v0.28.0
216216

217217
.PHONY: kustomize

go.mod

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.22.2
44

55
require (
66
github.com/distribution/reference v0.5.0
7+
github.com/golangci/golangci-lint v1.55.2
78
github.com/onsi/ginkgo/v2 v2.19.0
89
github.com/onsi/gomega v1.33.1
910
github.com/open-policy-agent/cert-controller v0.10.1
@@ -12,53 +13,68 @@ require (
1213
k8s.io/client-go v0.29.5
1314
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
1415
sigs.k8s.io/controller-runtime v0.17.3
16+
sigs.k8s.io/controller-tools v0.14.0
1517
sigs.k8s.io/kueue v0.7.0
18+
sigs.k8s.io/kustomize/kustomize/v5 v5.3.0
1619
sigs.k8s.io/yaml v1.4.0
1720
)
1821

1922
require (
2023
github.com/beorn7/perks v1.0.1 // indirect
2124
github.com/blang/semver/v4 v4.0.0 // indirect
2225
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23-
github.com/davecgh/go-spew v1.1.1 // indirect
26+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2427
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2528
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
29+
github.com/fatih/color v1.16.0 // indirect
2630
github.com/fsnotify/fsnotify v1.7.0 // indirect
31+
github.com/go-errors/errors v1.4.2 // indirect
2732
github.com/go-logr/logr v1.4.2 // indirect
2833
github.com/go-logr/zapr v1.3.0 // indirect
2934
github.com/go-openapi/jsonpointer v0.20.0 // indirect
3035
github.com/go-openapi/jsonreference v0.20.2 // indirect
3136
github.com/go-openapi/swag v0.22.4 // indirect
3237
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
38+
github.com/gobuffalo/flect v1.0.2 // indirect
3339
github.com/gogo/protobuf v1.3.2 // indirect
3440
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3541
github.com/golang/protobuf v1.5.4 // indirect
3642
github.com/google/gnostic-models v0.6.8 // indirect
3743
github.com/google/go-cmp v0.6.0 // indirect
3844
github.com/google/gofuzz v1.2.0 // indirect
3945
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
46+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4047
github.com/google/uuid v1.6.0 // indirect
4148
github.com/imdario/mergo v0.3.16 // indirect
49+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4250
github.com/josharian/intern v1.0.0 // indirect
4351
github.com/json-iterator/go v1.1.12 // indirect
4452
github.com/mailru/easyjson v0.7.7 // indirect
53+
github.com/mattn/go-colorable v0.1.13 // indirect
54+
github.com/mattn/go-isatty v0.0.20 // indirect
4555
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4656
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4757
github.com/modern-go/reflect2 v1.0.2 // indirect
58+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
4859
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4960
github.com/opencontainers/go-digest v1.0.0 // indirect
5061
github.com/pkg/errors v0.9.1 // indirect
5162
github.com/prometheus/client_golang v1.18.0 // indirect
5263
github.com/prometheus/client_model v0.6.1 // indirect
5364
github.com/prometheus/common v0.45.0 // indirect
5465
github.com/prometheus/procfs v0.12.0 // indirect
66+
github.com/spf13/cobra v1.8.0 // indirect
5567
github.com/spf13/pflag v1.0.5 // indirect
68+
github.com/xlab/treeprint v1.2.0 // indirect
69+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
5670
go.uber.org/atomic v1.11.0 // indirect
5771
go.uber.org/multierr v1.11.0 // indirect
5872
go.uber.org/zap v1.27.0 // indirect
59-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
73+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
74+
golang.org/x/mod v0.17.0 // indirect
6075
golang.org/x/net v0.25.0 // indirect
6176
golang.org/x/oauth2 v0.12.0 // indirect
77+
golang.org/x/sync v0.7.0 // indirect
6278
golang.org/x/sys v0.20.0 // indirect
6379
golang.org/x/term v0.20.0 // indirect
6480
golang.org/x/text v0.15.0 // indirect
@@ -67,6 +83,7 @@ require (
6783
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6884
google.golang.org/appengine v1.6.8 // indirect
6985
google.golang.org/protobuf v1.33.0 // indirect
86+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7087
gopkg.in/inf.v0 v0.9.1 // indirect
7188
gopkg.in/yaml.v2 v2.4.0 // indirect
7289
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -77,5 +94,7 @@ require (
7794
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7895
sigs.k8s.io/jobset v0.5.1 // indirect
7996
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
97+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
98+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
8099
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
81100
)

0 commit comments

Comments
 (0)