Skip to content

Commit 1e0e989

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #972 from aramase/update-tool-deps
chore: update tools dependencies and generate manifests
2 parents 60dc8d0 + a95f0e5 commit 1e0e989

18 files changed

+346
-433
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ EKSCTL := eksctl
9595
YQ := yq
9696

9797
# Test variables
98-
KIND_VERSION ?= 0.13.0
98+
KIND_VERSION ?= 0.14.0
9999
KUBERNETES_VERSION ?= 1.24.0
100100
KUBECTL_VERSION ?= 1.24.0
101101
BATS_VERSION ?= 1.4.1
102-
TRIVY_VERSION ?= 0.24.4
102+
TRIVY_VERSION ?= 0.29.1
103103
PROTOC_VERSION ?= 3.15.2
104104
SHELLCHECK_VER ?= v0.8.0
105105
YQ_VERSION ?= v4.11.2
@@ -173,7 +173,7 @@ $(GOLANGCI_LINT): ## Build golangci-lint from tools folder.
173173

174174
$(KUSTOMIZE): ## Build kustomize from tools folder.
175175
cd $(TOOLS_MOD_DIR) && \
176-
GOPROXY=$(GOPROXY) go build -tags=tools -o $(TOOLS_BIN_DIR)/kustomize sigs.k8s.io/kustomize/kustomize/v3
176+
GOPROXY=$(GOPROXY) go build -tags=tools -o $(TOOLS_BIN_DIR)/kustomize sigs.k8s.io/kustomize/kustomize/v4
177177

178178
$(PROTOC_GEN_GO):
179179
cd $(TOOLS_MOD_DIR) && \

‎config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.0
87
creationTimestamp: null
98
name: secretproviderclasses.secrets-store.csi.x-k8s.io
109
spec:
@@ -191,9 +190,3 @@ spec:
191190
type: object
192191
served: true
193192
storage: false
194-
status:
195-
acceptedNames:
196-
kind: ""
197-
plural: ""
198-
conditions: []
199-
storedVersions: []

‎config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
6+
controller-gen.kubebuilder.io/version: v0.9.0
87
creationTimestamp: null
98
name: secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io
109
spec:
@@ -107,9 +106,3 @@ spec:
107106
type: object
108107
served: true
109108
storage: false
110-
status:
111-
acceptedNames:
112-
kind: ""
113-
plural: ""
114-
conditions: []
115-
storedVersions: []

‎config/rbac-rotation/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎config/rbac-syncsecret/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎config/rbac-tokenrequest/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎hack/tools/go.mod

Lines changed: 66 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ go 1.18
44

55
require (
66
github.com/golang/protobuf v1.5.2
7-
github.com/golangci/golangci-lint v1.45.2
8-
k8s.io/code-generator v0.22.2
9-
sigs.k8s.io/controller-tools v0.7.0
10-
sigs.k8s.io/kustomize/kustomize/v3 v3.10.0
7+
github.com/golangci/golangci-lint v1.46.2
8+
k8s.io/code-generator v0.24.2
9+
sigs.k8s.io/controller-tools v0.9.0
10+
sigs.k8s.io/kustomize/kustomize/v4 v4.5.5
1111
)
1212

1313
require (
1414
4d63.com/gochecknoglobals v0.1.0 // indirect
15-
github.com/Antonboom/errname v0.1.5 // indirect
16-
github.com/Antonboom/nilnil v0.1.0 // indirect
17-
github.com/BurntSushi/toml v1.0.0 // indirect
15+
github.com/Antonboom/errname v0.1.6 // indirect
16+
github.com/Antonboom/nilnil v0.1.1 // indirect
17+
github.com/BurntSushi/toml v1.1.0 // indirect
1818
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
19+
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 // indirect
1920
github.com/Masterminds/semver v1.5.0 // indirect
2021
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
2122
github.com/PuerkitoBio/purell v1.1.1 // indirect
@@ -25,41 +26,33 @@ require (
2526
github.com/ashanbrown/forbidigo v1.3.0 // indirect
2627
github.com/ashanbrown/makezero v1.1.1 // indirect
2728
github.com/beorn7/perks v1.0.1 // indirect
28-
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2929
github.com/bkielbasa/cyclop v1.2.0 // indirect
30-
github.com/blizzy78/varnamelen v0.6.1 // indirect
30+
github.com/blizzy78/varnamelen v0.8.0 // indirect
3131
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
32-
github.com/breml/bidichk v0.2.2 // indirect
33-
github.com/breml/errchkjson v0.2.3 // indirect
32+
github.com/breml/bidichk v0.2.3 // indirect
33+
github.com/breml/errchkjson v0.3.0 // indirect
3434
github.com/butuzov/ireturn v0.1.1 // indirect
3535
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3636
github.com/charithe/durationcheck v0.0.9 // indirect
37-
github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect
37+
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
3838
github.com/daixiang0/gci v0.3.3 // indirect
3939
github.com/davecgh/go-spew v1.1.1 // indirect
4040
github.com/denis-tingaikin/go-header v0.4.3 // indirect
4141
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
4242
github.com/esimonov/ifshort v1.0.4 // indirect
4343
github.com/ettle/strcase v0.1.1 // indirect
44-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
44+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4545
github.com/fatih/color v1.13.0 // indirect
4646
github.com/fatih/structtag v1.2.0 // indirect
47-
github.com/fsnotify/fsnotify v1.5.1 // indirect
48-
github.com/fzipp/gocyclo v0.4.0 // indirect
49-
github.com/go-critic/go-critic v0.6.2 // indirect
47+
github.com/firefart/nonamedreturns v1.0.1 // indirect
48+
github.com/fsnotify/fsnotify v1.5.4 // indirect
49+
github.com/fzipp/gocyclo v0.5.1 // indirect
50+
github.com/go-critic/go-critic v0.6.3 // indirect
5051
github.com/go-errors/errors v1.0.1 // indirect
51-
github.com/go-logr/logr v0.4.0 // indirect
52-
github.com/go-openapi/analysis v0.19.5 // indirect
53-
github.com/go-openapi/errors v0.19.2 // indirect
52+
github.com/go-logr/logr v1.2.0 // indirect
5453
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5554
github.com/go-openapi/jsonreference v0.19.5 // indirect
56-
github.com/go-openapi/loads v0.19.4 // indirect
57-
github.com/go-openapi/runtime v0.19.4 // indirect
58-
github.com/go-openapi/spec v0.19.5 // indirect
59-
github.com/go-openapi/strfmt v0.19.5 // indirect
6055
github.com/go-openapi/swag v0.19.14 // indirect
61-
github.com/go-openapi/validate v0.19.8 // indirect
62-
github.com/go-stack/stack v1.8.0 // indirect
6356
github.com/go-toolsmith/astcast v1.0.0 // indirect
6457
github.com/go-toolsmith/astcopy v1.0.0 // indirect
6558
github.com/go-toolsmith/astequal v1.0.1 // indirect
@@ -68,19 +61,20 @@ require (
6861
github.com/go-toolsmith/strparse v1.0.0 // indirect
6962
github.com/go-toolsmith/typep v1.0.2 // indirect
7063
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
71-
github.com/gobuffalo/flect v0.2.3 // indirect
64+
github.com/gobuffalo/flect v0.2.5 // indirect
7265
github.com/gobwas/glob v0.2.3 // indirect
7366
github.com/gofrs/flock v0.8.1 // indirect
7467
github.com/gogo/protobuf v1.3.2 // indirect
7568
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
7669
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
77-
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect
70+
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
7871
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
7972
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
8073
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
8174
github.com/golangci/misspell v0.3.5 // indirect
8275
github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
8376
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
77+
github.com/google/gnostic v0.5.7-v3refs // indirect
8478
github.com/google/go-cmp v0.5.7 // indirect
8579
github.com/google/gofuzz v1.1.0 // indirect
8680
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -90,9 +84,7 @@ require (
9084
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
9185
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
9286
github.com/hashicorp/errwrap v1.0.0 // indirect
93-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
9487
github.com/hashicorp/go-multierror v1.1.1 // indirect
95-
github.com/hashicorp/go-safetemp v1.0.0 // indirect
9688
github.com/hashicorp/go-version v1.4.0 // indirect
9789
github.com/hashicorp/hcl v1.0.0 // indirect
9890
github.com/hexops/gotextdiff v1.0.3 // indirect
@@ -106,13 +98,14 @@ require (
10698
github.com/julz/importas v0.1.0 // indirect
10799
github.com/kisielk/errcheck v1.6.0 // indirect
108100
github.com/kisielk/gotool v1.0.0 // indirect
109-
github.com/kulti/thelper v0.5.1 // indirect
101+
github.com/kulti/thelper v0.6.2 // indirect
110102
github.com/kunwardeep/paralleltest v1.0.3 // indirect
111103
github.com/kyoh86/exportloopref v0.1.8 // indirect
112-
github.com/ldez/gomoddirectives v0.2.2 // indirect
104+
github.com/ldez/gomoddirectives v0.2.3 // indirect
113105
github.com/ldez/tagliatelle v0.3.1 // indirect
114106
github.com/leonklingele/grouper v1.1.0 // indirect
115-
github.com/magiconair/properties v1.8.5 // indirect
107+
github.com/lufeee/execinquery v1.2.1 // indirect
108+
github.com/magiconair/properties v1.8.6 // indirect
116109
github.com/mailru/easyjson v0.7.6 // indirect
117110
github.com/maratori/testpackage v1.0.1 // indirect
118111
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
@@ -121,96 +114,96 @@ require (
121114
github.com/mattn/go-runewidth v0.0.9 // indirect
122115
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
123116
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
124-
github.com/mgechev/revive v1.1.4 // indirect
117+
github.com/mgechev/revive v1.2.1 // indirect
125118
github.com/mitchellh/go-homedir v1.1.0 // indirect
126-
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
127-
github.com/mitchellh/mapstructure v1.4.3 // indirect
119+
github.com/mitchellh/mapstructure v1.5.0 // indirect
128120
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
129121
github.com/modern-go/reflect2 v1.0.2 // indirect
130122
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
131123
github.com/moricho/tparallel v0.2.1 // indirect
132124
github.com/nakabonne/nestif v0.3.1 // indirect
133125
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
134126
github.com/nishanths/exhaustive v0.7.11 // indirect
135-
github.com/nishanths/predeclared v0.2.1 // indirect
127+
github.com/nishanths/predeclared v0.2.2 // indirect
136128
github.com/olekukonko/tablewriter v0.0.5 // indirect
137-
github.com/pelletier/go-toml v1.9.4 // indirect
129+
github.com/pelletier/go-toml v1.9.5 // indirect
130+
github.com/pelletier/go-toml/v2 v2.0.0 // indirect
138131
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
139132
github.com/pkg/errors v0.9.1 // indirect
140133
github.com/pmezard/go-difflib v1.0.0 // indirect
141-
github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b // indirect
142-
github.com/prometheus/client_golang v1.11.0 // indirect
134+
github.com/polyfloyd/go-errorlint v1.0.0 // indirect
135+
github.com/prometheus/client_golang v1.12.1 // indirect
143136
github.com/prometheus/client_model v0.2.0 // indirect
144-
github.com/prometheus/common v0.26.0 // indirect
145-
github.com/prometheus/procfs v0.6.0 // indirect
146-
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d // indirect
147-
github.com/quasilyte/go-ruleguard v0.3.15 // indirect
148-
github.com/quasilyte/gogrep v0.0.0-20220103110004-ffaa07af02e3 // indirect
137+
github.com/prometheus/common v0.32.1 // indirect
138+
github.com/prometheus/procfs v0.7.3 // indirect
139+
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
140+
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
149141
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
142+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
150143
github.com/ryancurrah/gomodguard v1.2.3 // indirect
151144
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
152145
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
153-
github.com/securego/gosec/v2 v2.10.0 // indirect
146+
github.com/securego/gosec/v2 v2.11.0 // indirect
154147
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
155148
github.com/sirupsen/logrus v1.8.1 // indirect
156149
github.com/sivchari/containedctx v1.0.2 // indirect
157-
github.com/sivchari/tenv v1.4.7 // indirect
150+
github.com/sivchari/tenv v1.5.0 // indirect
158151
github.com/sonatard/noctx v0.0.1 // indirect
159152
github.com/sourcegraph/go-diff v0.6.1 // indirect
160-
github.com/spf13/afero v1.6.0 // indirect
153+
github.com/spf13/afero v1.8.2 // indirect
161154
github.com/spf13/cast v1.4.1 // indirect
162155
github.com/spf13/cobra v1.4.0 // indirect
163156
github.com/spf13/jwalterweatherman v1.1.0 // indirect
164157
github.com/spf13/pflag v1.0.5 // indirect
165-
github.com/spf13/viper v1.10.1 // indirect
158+
github.com/spf13/viper v1.11.0 // indirect
166159
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
160+
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
167161
github.com/stretchr/objx v0.2.0 // indirect
168162
github.com/stretchr/testify v1.7.1 // indirect
169163
github.com/subosito/gotenv v1.2.0 // indirect
170164
github.com/sylvia7788/contextcheck v1.0.4 // indirect
171165
github.com/tdakkota/asciicheck v0.1.1 // indirect
172166
github.com/tetafro/godot v1.4.11 // indirect
173167
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
174-
github.com/tomarrell/wrapcheck/v2 v2.5.0 // indirect
168+
github.com/tomarrell/wrapcheck/v2 v2.6.1 // indirect
175169
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
176-
github.com/ulikunitz/xz v0.5.8 // indirect
177170
github.com/ultraware/funlen v0.0.3 // indirect
178171
github.com/ultraware/whitespace v0.0.5 // indirect
179172
github.com/uudashr/gocognit v1.0.5 // indirect
180173
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
181174
github.com/yagipy/maintidx v1.0.0 // indirect
182-
github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 // indirect
183-
github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf // indirect
175+
github.com/yeya24/promlinter v0.2.0 // indirect
184176
gitlab.com/bosi/decorder v0.2.1 // indirect
185-
go.mongodb.org/mongo-driver v1.1.2 // indirect
186177
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
178+
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
187179
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
188-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
180+
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
189181
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
190-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
182+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
191183
golang.org/x/text v0.3.7 // indirect
192-
golang.org/x/tools v0.1.10 // indirect
193-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
194-
google.golang.org/protobuf v1.27.1 // indirect
184+
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
185+
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
186+
google.golang.org/protobuf v1.28.0 // indirect
195187
gopkg.in/inf.v0 v0.9.1 // indirect
196-
gopkg.in/ini.v1 v1.66.2 // indirect
188+
gopkg.in/ini.v1 v1.66.4 // indirect
197189
gopkg.in/yaml.v2 v2.4.0 // indirect
198190
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
199-
honnef.co/go/tools v0.2.2 // indirect
200-
k8s.io/api v0.22.2 // indirect
201-
k8s.io/apiextensions-apiserver v0.22.2 // indirect
202-
k8s.io/apimachinery v0.22.2 // indirect
203-
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
204-
k8s.io/klog/v2 v2.9.0 // indirect
205-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
206-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
207-
mvdan.cc/gofumpt v0.3.0 // indirect
191+
honnef.co/go/tools v0.3.1 // indirect
192+
k8s.io/api v0.24.0 // indirect
193+
k8s.io/apiextensions-apiserver v0.24.0 // indirect
194+
k8s.io/apimachinery v0.24.0 // indirect
195+
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
196+
k8s.io/klog/v2 v2.60.1 // indirect
197+
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
198+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
199+
mvdan.cc/gofumpt v0.3.1 // indirect
208200
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
209201
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
210202
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5 // indirect
211-
sigs.k8s.io/kustomize/api v0.8.0 // indirect
212-
sigs.k8s.io/kustomize/cmd/config v0.9.1 // indirect
213-
sigs.k8s.io/kustomize/kyaml v0.10.9 // indirect
214-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
215-
sigs.k8s.io/yaml v1.2.0 // indirect
203+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
204+
sigs.k8s.io/kustomize/api v0.11.5 // indirect
205+
sigs.k8s.io/kustomize/cmd/config v0.10.7 // indirect
206+
sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect
207+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
208+
sigs.k8s.io/yaml v1.3.0 // indirect
216209
)

0 commit comments

Comments
 (0)