Skip to content

Commit 1af833c

Browse files
deps: bump sigs.k8s.io/controller-tools from 0.11.3 to 0.12.0 in /build/tools (#1938)
1 parent f501180 commit 1af833c

File tree

7 files changed

+92
-288
lines changed

7 files changed

+92
-288
lines changed

Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -760,46 +760,44 @@ setup: tools install-hooks gitconfig ## performs common required repo setup
760760

761761
##@ Tools
762762

763-
TOOL_TAG = azure-container-netwokring/build/tools
764-
765763
$(TOOLS_DIR)/go.mod:
766764
cd $(TOOLS_DIR); go mod init && go mod tidy
767765

768766
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod
769-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
767+
cd $(TOOLS_DIR); go mod download; go build -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
770768

771769
controller-gen: $(CONTROLLER_GEN) ## Build controller-gen
772770

773771
protoc:
774772
source ${REPO_ROOT}/scripts/install-protoc.sh
775773

776774
$(GOCOV): $(TOOLS_DIR)/go.mod
777-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gocov github.com/axw/gocov/gocov
775+
cd $(TOOLS_DIR); go mod download; go build -o bin/gocov github.com/axw/gocov/gocov
778776

779777
gocov: $(GOCOV) ## Build gocov
780778

781779
$(GOCOV_XML): $(TOOLS_DIR)/go.mod
782-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gocov-xml github.com/AlekSi/gocov-xml
780+
cd $(TOOLS_DIR); go mod download; go build -o bin/gocov-xml github.com/AlekSi/gocov-xml
783781

784782
gocov-xml: $(GOCOV_XML) ## Build gocov-xml
785783

786784
$(GOFUMPT): $(TOOLS_DIR)/go.mod
787-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/gofumpt mvdan.cc/gofumpt
785+
cd $(TOOLS_DIR); go mod download; go build -o bin/gofumpt mvdan.cc/gofumpt
788786

789787
gofumpt: $(GOFUMPT) ## Build gofumpt
790788

791789
$(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod
792-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
790+
cd $(TOOLS_DIR); go mod download; go build -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
793791

794792
golangci-lint: $(GOLANGCI_LINT) ## Build golangci-lint
795793

796794
$(GO_JUNIT_REPORT): $(TOOLS_DIR)/go.mod
797-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/go-junit-report github.com/jstemmer/go-junit-report
795+
cd $(TOOLS_DIR); go mod download; go build -o bin/go-junit-report github.com/jstemmer/go-junit-report
798796

799797
go-junit-report: $(GO_JUNIT_REPORT) ## Build go-junit-report
800798

801799
$(MOCKGEN): $(TOOLS_DIR)/go.mod
802-
cd $(TOOLS_DIR); go mod download; go build -tags=$(TOOL_TAG) -o bin/mockgen github.com/golang/mock/mockgen
800+
cd $(TOOLS_DIR); go mod download; go build -o bin/mockgen github.com/golang/mock/mockgen
803801

804802
mockgen: $(MOCKGEN) ## Build mockgen
805803

build/tools/go.mod

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ require (
1010
github.com/jstemmer/go-junit-report v1.0.0
1111
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
1212
google.golang.org/protobuf v1.30.0
13-
mvdan.cc/gofumpt v0.4.0
14-
sigs.k8s.io/controller-tools v0.11.3
13+
mvdan.cc/gofumpt v0.5.0
14+
sigs.k8s.io/controller-tools v0.12.0
1515
)
1616

1717
require (
1818
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
1919
4d63.com/gochecknoglobals v0.2.1 // indirect
2020
github.com/Abirdcfly/dupword v0.0.11 // indirect
2121
github.com/Antonboom/errname v0.1.9 // indirect
22-
github.com/Antonboom/nilnil v0.1.4 // indirect
22+
github.com/Antonboom/nilnil v0.1.3 // indirect
2323
github.com/BurntSushi/toml v1.2.1 // indirect
2424
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2525
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
@@ -36,7 +36,7 @@ require (
3636
github.com/breml/bidichk v0.2.4 // indirect
3737
github.com/breml/errchkjson v0.3.1 // indirect
3838
github.com/butuzov/ireturn v0.1.1 // indirect
39-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
39+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4040
github.com/charithe/durationcheck v0.0.10 // indirect
4141
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
4242
github.com/curioswitch/go-reassign v0.2.0 // indirect
@@ -51,7 +51,7 @@ require (
5151
github.com/fsnotify/fsnotify v1.6.0 // indirect
5252
github.com/fzipp/gocyclo v0.6.0 // indirect
5353
github.com/go-critic/go-critic v0.7.0 // indirect
54-
github.com/go-logr/logr v1.2.4 // indirect
54+
github.com/go-logr/logr v1.2.3 // indirect
5555
github.com/go-toolsmith/astcast v1.1.0 // indirect
5656
github.com/go-toolsmith/astcopy v1.1.0 // indirect
5757
github.com/go-toolsmith/astequal v1.1.0 // indirect
@@ -75,13 +75,13 @@ require (
7575
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
7676
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
7777
github.com/google/go-cmp v0.5.9 // indirect
78-
github.com/google/gofuzz v1.2.0 // indirect
78+
github.com/google/gofuzz v1.1.0 // indirect
7979
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
8080
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
8181
github.com/gostaticanalysis/comment v1.4.2 // indirect
8282
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
8383
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
84-
github.com/hashicorp/errwrap v1.1.0 // indirect
84+
github.com/hashicorp/errwrap v1.0.0 // indirect
8585
github.com/hashicorp/go-multierror v1.1.1 // indirect
8686
github.com/hashicorp/go-version v1.6.0 // indirect
8787
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -103,14 +103,14 @@ require (
103103
github.com/ldez/tagliatelle v0.4.0 // indirect
104104
github.com/leonklingele/grouper v1.1.1 // indirect
105105
github.com/lufeee/execinquery v1.2.1 // indirect
106-
github.com/magiconair/properties v1.8.7 // indirect
106+
github.com/magiconair/properties v1.8.6 // indirect
107107
github.com/maratori/testableexamples v1.0.0 // indirect
108108
github.com/maratori/testpackage v1.1.1 // indirect
109109
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
110110
github.com/mattn/go-colorable v0.1.13 // indirect
111-
github.com/mattn/go-isatty v0.0.18 // indirect
112-
github.com/mattn/go-runewidth v0.0.14 // indirect
113-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
111+
github.com/mattn/go-isatty v0.0.17 // indirect
112+
github.com/mattn/go-runewidth v0.0.9 // indirect
113+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
114114
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
115115
github.com/mgechev/revive v1.3.1 // indirect
116116
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -120,24 +120,22 @@ require (
120120
github.com/moricho/tparallel v0.3.1 // indirect
121121
github.com/nakabonne/nestif v0.3.1 // indirect
122122
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
123-
github.com/nishanths/exhaustive v0.10.0 // indirect
123+
github.com/nishanths/exhaustive v0.9.5 // indirect
124124
github.com/nishanths/predeclared v0.2.2 // indirect
125-
github.com/nunnatsa/ginkgolinter v0.10.0 // indirect
125+
github.com/nunnatsa/ginkgolinter v0.9.0 // indirect
126126
github.com/olekukonko/tablewriter v0.0.5 // indirect
127127
github.com/pelletier/go-toml v1.9.5 // indirect
128-
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
129-
github.com/pkg/errors v0.9.1 // indirect
128+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
130129
github.com/pmezard/go-difflib v1.0.0 // indirect
131130
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
132131
github.com/prometheus/client_golang v1.14.0 // indirect
133132
github.com/prometheus/client_model v0.3.0 // indirect
134-
github.com/prometheus/common v0.42.0 // indirect
135-
github.com/prometheus/procfs v0.9.0 // indirect
133+
github.com/prometheus/common v0.37.0 // indirect
134+
github.com/prometheus/procfs v0.8.0 // indirect
136135
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
137136
github.com/quasilyte/gogrep v0.5.0 // indirect
138137
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
139138
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
140-
github.com/rivo/uniseg v0.4.4 // indirect
141139
github.com/ryancurrah/gomodguard v1.3.0 // indirect
142140
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
143141
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
@@ -146,22 +144,22 @@ require (
146144
github.com/securego/gosec/v2 v2.15.0 // indirect
147145
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
148146
github.com/sirupsen/logrus v1.9.0 // indirect
149-
github.com/sivchari/containedctx v1.0.3 // indirect
147+
github.com/sivchari/containedctx v1.0.2 // indirect
150148
github.com/sivchari/nosnakecase v1.7.0 // indirect
151149
github.com/sivchari/tenv v1.7.1 // indirect
152150
github.com/sonatard/noctx v0.0.2 // indirect
153151
github.com/sourcegraph/go-diff v0.7.0 // indirect
154-
github.com/spf13/afero v1.9.5 // indirect
152+
github.com/spf13/afero v1.8.2 // indirect
155153
github.com/spf13/cast v1.5.0 // indirect
156-
github.com/spf13/cobra v1.6.1 // indirect
154+
github.com/spf13/cobra v1.7.0 // indirect
157155
github.com/spf13/jwalterweatherman v1.1.0 // indirect
158156
github.com/spf13/pflag v1.0.5 // indirect
159-
github.com/spf13/viper v1.15.0 // indirect
157+
github.com/spf13/viper v1.12.0 // indirect
160158
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
161159
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
162160
github.com/stretchr/objx v0.5.0 // indirect
163161
github.com/stretchr/testify v1.8.2 // indirect
164-
github.com/subosito/gotenv v1.4.2 // indirect
162+
github.com/subosito/gotenv v1.4.1 // indirect
165163
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
166164
github.com/tdakkota/asciicheck v0.2.0 // indirect
167165
github.com/tetafro/godot v1.4.11 // indirect
@@ -175,30 +173,30 @@ require (
175173
github.com/yagipy/maintidx v1.0.0 // indirect
176174
github.com/yeya24/promlinter v0.2.0 // indirect
177175
gitlab.com/bosi/decorder v0.2.3 // indirect
178-
go.uber.org/atomic v1.10.0 // indirect
179-
go.uber.org/multierr v1.11.0 // indirect
176+
go.uber.org/atomic v1.7.0 // indirect
177+
go.uber.org/multierr v1.6.0 // indirect
180178
go.uber.org/zap v1.24.0 // indirect
181-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
182-
golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 // indirect
183-
golang.org/x/mod v0.9.0 // indirect
184-
golang.org/x/net v0.8.0 // indirect
179+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
180+
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
181+
golang.org/x/mod v0.10.0 // indirect
182+
golang.org/x/net v0.9.0 // indirect
185183
golang.org/x/sync v0.1.0 // indirect
186-
golang.org/x/sys v0.6.0 // indirect
187-
golang.org/x/text v0.8.0 // indirect
188-
golang.org/x/tools v0.7.0 // indirect
184+
golang.org/x/sys v0.7.0 // indirect
185+
golang.org/x/text v0.9.0 // indirect
186+
golang.org/x/tools v0.8.0 // indirect
189187
gopkg.in/inf.v0 v0.9.1 // indirect
190188
gopkg.in/ini.v1 v1.67.0 // indirect
191189
gopkg.in/yaml.v2 v2.4.0 // indirect
192190
gopkg.in/yaml.v3 v3.0.1 // indirect
193191
honnef.co/go/tools v0.4.3 // indirect
194-
k8s.io/api v0.26.3 // indirect
195-
k8s.io/apiextensions-apiserver v0.26.3 // indirect
196-
k8s.io/apimachinery v0.26.3 // indirect
192+
k8s.io/api v0.27.1 // indirect
193+
k8s.io/apiextensions-apiserver v0.27.1 // indirect
194+
k8s.io/apimachinery v0.27.1 // indirect
197195
k8s.io/klog/v2 v2.90.1 // indirect
198-
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
196+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
199197
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
200198
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
201-
mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8 // indirect
199+
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
202200
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
203201
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
204202
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)