Skip to content

Commit 24c64a4

Browse files
committed
Bump controller-tools to v0.13.0
The change to generated go build metadata requires a small change in boilerplate verification.
1 parent 78dd034 commit 24c64a4

File tree

3 files changed

+88
-85
lines changed

3 files changed

+88
-85
lines changed

hack/boilerplate/boilerplate.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ def file_passes(filename, refs, regexs):
107107

108108
data = data.splitlines()
109109

110+
# trim leading blank lines
111+
while len(data) > 0 and data[0] == "":
112+
data = data[1:]
113+
110114
# if our test file is smaller than the reference it surely fails!
111115
if len(ref) > len(data):
112116
print('File %s smaller than reference (%d < %d)' %

hack/tools/go.mod

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/a8m/envsubst v1.2.0
77
github.com/golang/mock v1.6.0
88
github.com/itchyny/gojq v0.12.2
9-
github.com/onsi/ginkgo/v2 v2.9.2
10-
k8s.io/code-generator v0.25.0
9+
github.com/onsi/ginkgo/v2 v2.9.4
10+
k8s.io/code-generator v0.28.0
1111
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6
12-
sigs.k8s.io/controller-tools v0.10.0
12+
sigs.k8s.io/controller-tools v0.13.0
1313
sigs.k8s.io/kind v0.14.0
1414
sigs.k8s.io/kustomize/kustomize/v4 v4.4.0
1515
)
@@ -23,61 +23,60 @@ require (
2323
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2424
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2525
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26-
github.com/fatih/color v1.14.1 // indirect
26+
github.com/fatih/color v1.15.0 // indirect
2727
github.com/go-errors/errors v1.0.1 // indirect
2828
github.com/go-logr/logr v1.2.4 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30-
github.com/go-openapi/jsonreference v0.20.0 // indirect
29+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
30+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3131
github.com/go-openapi/swag v0.22.3 // indirect
3232
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
33-
github.com/gobuffalo/flect v0.3.0 // indirect
33+
github.com/gobuffalo/flect v1.0.2 // indirect
3434
github.com/gogo/protobuf v1.3.2 // indirect
3535
github.com/golang/protobuf v1.5.3 // indirect
3636
github.com/google/gnostic v0.6.9 // indirect
37+
github.com/google/gnostic-models v0.6.8 // indirect
38+
github.com/google/go-cmp v0.5.9 // indirect
3739
github.com/google/gofuzz v1.2.0 // indirect
3840
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
3941
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4042
github.com/imdario/mergo v0.3.13 // indirect
41-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
43+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4244
github.com/itchyny/go-flags v1.5.0 // indirect
4345
github.com/itchyny/timefmt-go v0.1.2 // indirect
4446
github.com/josharian/intern v1.0.0 // indirect
4547
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/kr/pretty v0.3.0 // indirect
4748
github.com/mailru/easyjson v0.7.7 // indirect
4849
github.com/mattn/go-colorable v0.1.13 // indirect
4950
github.com/mattn/go-isatty v0.0.17 // indirect
5051
github.com/mattn/go-runewidth v0.0.9 // indirect
51-
github.com/mitchellh/mapstructure v1.5.0 // indirect
5252
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5353
github.com/modern-go/reflect2 v1.0.2 // indirect
5454
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5555
github.com/olekukonko/tablewriter v0.0.5 // indirect
5656
github.com/pelletier/go-toml v1.9.5 // indirect
5757
github.com/pkg/errors v0.9.1 // indirect
58-
github.com/rogpeppe/go-internal v1.9.0 // indirect
59-
github.com/spf13/cobra v1.6.1 // indirect
58+
github.com/spf13/cobra v1.7.0 // indirect
6059
github.com/spf13/pflag v1.0.5 // indirect
61-
github.com/stretchr/testify v1.8.1 // indirect
6260
github.com/xlab/treeprint v1.1.0 // indirect
6361
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
64-
golang.org/x/mod v0.9.0 // indirect
65-
golang.org/x/net v0.8.0 // indirect
66-
golang.org/x/sys v0.7.0 // indirect
67-
golang.org/x/text v0.8.0 // indirect
68-
golang.org/x/tools v0.7.0 // indirect
69-
google.golang.org/protobuf v1.28.1 // indirect
62+
golang.org/x/mod v0.12.0 // indirect
63+
golang.org/x/net v0.14.0 // indirect
64+
golang.org/x/sys v0.11.0 // indirect
65+
golang.org/x/text v0.12.0 // indirect
66+
golang.org/x/tools v0.12.0 // indirect
67+
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
68+
google.golang.org/protobuf v1.30.0 // indirect
7069
gopkg.in/inf.v0 v0.9.1 // indirect
7170
gopkg.in/yaml.v2 v2.4.0 // indirect
7271
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
k8s.io/api v0.25.0 // indirect
74-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
75-
k8s.io/apimachinery v0.25.0 // indirect
76-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
77-
k8s.io/klog/v2 v2.80.1 // indirect
78-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
79-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
80-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
72+
k8s.io/api v0.28.0 // indirect
73+
k8s.io/apiextensions-apiserver v0.28.0 // indirect
74+
k8s.io/apimachinery v0.28.0 // indirect
75+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
76+
k8s.io/klog/v2 v2.100.1 // indirect
77+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
78+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
79+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8180
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect
8281
sigs.k8s.io/kustomize/api v0.12.1 // indirect
8382
sigs.k8s.io/kustomize/cmd/config v0.10.1 // indirect

0 commit comments

Comments
 (0)