Skip to content

Commit 23e4585

Browse files
tomasaschantomasaschan
committed
Remove the need for setup-envtest
This relies on yet unreleased features of controller-runtime, but it will we'll be able to roll forward to the next patch release as soon as one that contains both kubernetes-sigs/controller-runtime#3135 and kubernetes-sigs/controller-runtime#3137 is released.
1 parent 14c08c8 commit 23e4585

File tree

6 files changed

+115
-148
lines changed

6 files changed

+115
-148
lines changed

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ KUBECTL ?= kubectl
150150
KIND ?= kind
151151
KUSTOMIZE ?= $(LOCALBIN)/kustomize
152152
KO ?= $(LOCALBIN)/ko
153-
ENVTEST ?= $(LOCALBIN)/setup-envtest
154153

155154
## Tool Versions
156155
KO_VERSION ?= v0.17.1

‎go.mod‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ require (
88
github.com/google/cel-go v0.24.1
99
github.com/onsi/ginkgo/v2 v2.22.1
1010
github.com/onsi/gomega v1.36.2
11-
github.com/prometheus/client_golang v1.19.1
11+
github.com/prometheus/client_golang v1.22.0-rc.0
1212
github.com/spf13/cobra v1.8.1
13-
github.com/stretchr/testify v1.9.0
13+
github.com/stretchr/testify v1.10.0
1414
go.uber.org/zap v1.27.0
1515
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
16-
golang.org/x/time v0.7.0
17-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7
18-
k8s.io/api v0.32.1
19-
k8s.io/apiextensions-apiserver v0.32.1
20-
k8s.io/apimachinery v0.32.1
21-
k8s.io/apiserver v0.32.1
22-
k8s.io/client-go v0.32.1
23-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
24-
sigs.k8s.io/controller-runtime v0.19.0
16+
golang.org/x/time v0.11.0
17+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576
18+
k8s.io/api v0.33.0-beta.0
19+
k8s.io/apiextensions-apiserver v0.33.0-beta.0
20+
k8s.io/apimachinery v0.33.0-beta.0
21+
k8s.io/apiserver v0.33.0-beta.0
22+
k8s.io/client-go v0.33.0-beta.0
23+
k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9
24+
sigs.k8s.io/controller-runtime v0.20.1-0.20250313041745-d82dcd80ca96
2525
)
2626

2727
require (
@@ -30,25 +30,25 @@ require (
3030
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3131
github.com/awslabs/attribution-gen v0.0.4 // indirect
3232
github.com/beorn7/perks v1.0.1 // indirect
33+
github.com/blang/semver/v4 v4.0.0 // indirect
3334
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
3435
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3536
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
36-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
37+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3738
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
39+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3940
github.com/fatih/color v1.18.0 // indirect
40-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/fsnotify/fsnotify v1.8.0 // indirect
4142
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4243
github.com/go-logr/zapr v1.3.0 // indirect
43-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
44+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4445
github.com/go-openapi/jsonreference v0.21.0 // indirect
45-
github.com/go-openapi/swag v0.23.0 // indirect
46+
github.com/go-openapi/swag v0.23.1 // indirect
4647
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4748
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/gnostic-models v0.6.8 // indirect
50-
github.com/google/go-cmp v0.6.0 // indirect
51-
github.com/google/gofuzz v1.2.0 // indirect
49+
github.com/google/btree v1.1.3 // indirect
50+
github.com/google/gnostic-models v0.6.9 // indirect
51+
github.com/google/go-cmp v0.7.0 // indirect
5252
github.com/google/licenseclassifier/v2 v2.0.0 // indirect
5353
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5454
github.com/google/uuid v1.6.0 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/josharian/intern v1.0.0 // indirect
5858
github.com/json-iterator/go v1.1.12 // indirect
5959
github.com/magiconair/properties v1.8.7 // indirect
60-
github.com/mailru/easyjson v0.7.7 // indirect
60+
github.com/mailru/easyjson v0.9.0 // indirect
6161
github.com/mattn/go-colorable v0.1.13 // indirect
6262
github.com/mattn/go-isatty v0.0.20 // indirect
6363
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -68,7 +68,7 @@ require (
6868
github.com/pkg/errors v0.9.1 // indirect
6969
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7070
github.com/prometheus/client_model v0.6.1 // indirect
71-
github.com/prometheus/common v0.55.0 // indirect
71+
github.com/prometheus/common v0.62.0 // indirect
7272
github.com/prometheus/procfs v0.15.1 // indirect
7373
github.com/sergi/go-diff v1.3.1 // indirect
7474
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -83,26 +83,27 @@ require (
8383
github.com/xlab/treeprint v1.2.0 // indirect
8484
go.uber.org/multierr v1.11.0 // indirect
8585
golang.org/x/mod v0.22.0 // indirect
86-
golang.org/x/net v0.36.0 // indirect
87-
golang.org/x/oauth2 v0.23.0 // indirect
88-
golang.org/x/sync v0.11.0 // indirect
89-
golang.org/x/sys v0.30.0 // indirect
90-
golang.org/x/term v0.29.0 // indirect
91-
golang.org/x/text v0.22.0 // indirect
86+
golang.org/x/net v0.37.0 // indirect
87+
golang.org/x/oauth2 v0.28.0 // indirect
88+
golang.org/x/sync v0.12.0 // indirect
89+
golang.org/x/sys v0.31.0 // indirect
90+
golang.org/x/term v0.30.0 // indirect
91+
golang.org/x/text v0.23.0 // indirect
9292
golang.org/x/tools v0.29.0 // indirect
93-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
94-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
95-
google.golang.org/protobuf v1.36.1 // indirect
93+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
94+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
95+
google.golang.org/protobuf v1.36.5 // indirect
9696
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9797
gopkg.in/inf.v0 v0.9.1 // indirect
9898
gopkg.in/ini.v1 v1.67.0 // indirect
9999
gopkg.in/yaml.v2 v2.4.0 // indirect
100100
gopkg.in/yaml.v3 v3.0.1 // indirect
101101
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
102+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
103103
sigs.k8s.io/controller-tools v0.17.2 // indirect
104-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
105-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
104+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
105+
sigs.k8s.io/randfill v1.0.0 // indirect
106+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
106107
sigs.k8s.io/yaml v1.4.0 // indirect
107108
)
108109

0 commit comments

Comments
 (0)