Skip to content

Commit 27faf59

Browse files
authored
revert controller-tools upgrade
Signed-off-by: Evan Baker <[email protected]>
1 parent b5e3c90 commit 27faf59

File tree

6 files changed

+138
-135
lines changed

6 files changed

+138
-135
lines changed

.github/workflows/crdgen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
crdgen119:
1212
strategy:
1313
matrix:
14-
go-version: ["1.21", "1.22"]
14+
go-version: ["1.21"]
1515
os: [ubuntu-latest]
1616
name: CRDs are Generated
1717
runs-on: ${{ matrix.os }}

build/tools/go.mod

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ require (
99
github.com/golangci/golangci-lint v1.52.2
1010
github.com/jstemmer/go-junit-report v1.0.0
1111
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
12-
google.golang.org/protobuf v1.34.2
12+
google.golang.org/protobuf v1.30.0
1313
mvdan.cc/gofumpt v0.5.0
14-
sigs.k8s.io/controller-tools v0.16.5
14+
sigs.k8s.io/controller-tools v0.12.0
1515
)
1616

1717
require (
@@ -36,23 +36,22 @@ 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.3.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
4343
github.com/daixiang0/gci v0.10.1 // indirect
44-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
44+
github.com/davecgh/go-spew v1.1.1 // indirect
4545
github.com/denis-tingaikin/go-header v0.4.3 // indirect
4646
github.com/esimonov/ifshort v1.0.4 // indirect
4747
github.com/ettle/strcase v0.1.1 // indirect
48-
github.com/fatih/color v1.18.0 // indirect
48+
github.com/fatih/color v1.15.0 // indirect
4949
github.com/fatih/structtag v1.2.0 // indirect
5050
github.com/firefart/nonamedreturns v1.0.4 // indirect
51-
github.com/fsnotify/fsnotify v1.7.0 // indirect
52-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
51+
github.com/fsnotify/fsnotify v1.6.0 // indirect
5352
github.com/fzipp/gocyclo v0.6.0 // indirect
5453
github.com/go-critic/go-critic v0.7.0 // indirect
55-
github.com/go-logr/logr v1.4.2 // indirect
54+
github.com/go-logr/logr v1.2.3 // indirect
5655
github.com/go-toolsmith/astcast v1.1.0 // indirect
5756
github.com/go-toolsmith/astcopy v1.1.0 // indirect
5857
github.com/go-toolsmith/astequal v1.1.0 // indirect
@@ -61,10 +60,11 @@ require (
6160
github.com/go-toolsmith/strparse v1.1.0 // indirect
6261
github.com/go-toolsmith/typep v1.1.0 // indirect
6362
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
64-
github.com/gobuffalo/flect v1.0.3 // indirect
63+
github.com/gobuffalo/flect v1.0.2 // indirect
6564
github.com/gobwas/glob v0.2.3 // indirect
6665
github.com/gofrs/flock v0.8.1 // indirect
6766
github.com/gogo/protobuf v1.3.2 // indirect
67+
github.com/golang/protobuf v1.5.3 // indirect
6868
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
6969
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
7070
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -74,8 +74,8 @@ require (
7474
github.com/golangci/misspell v0.4.0 // indirect
7575
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
7676
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
77-
github.com/google/go-cmp v0.6.0 // indirect
78-
github.com/google/gofuzz v1.2.0 // indirect
77+
github.com/google/go-cmp v0.5.9 // 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
@@ -108,16 +108,16 @@ require (
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.20 // indirect
111+
github.com/mattn/go-isatty v0.0.17 // indirect
112112
github.com/mattn/go-runewidth v0.0.9 // indirect
113+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
113114
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
114115
github.com/mgechev/revive v1.3.1 // indirect
115116
github.com/mitchellh/go-homedir v1.1.0 // indirect
116117
github.com/mitchellh/mapstructure v1.5.0 // indirect
117118
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
118119
github.com/modern-go/reflect2 v1.0.2 // indirect
119120
github.com/moricho/tparallel v0.3.1 // indirect
120-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
121121
github.com/nakabonne/nestif v0.3.1 // indirect
122122
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
123123
github.com/nishanths/exhaustive v0.9.5 // indirect
@@ -126,12 +126,12 @@ require (
126126
github.com/olekukonko/tablewriter v0.0.5 // indirect
127127
github.com/pelletier/go-toml v1.9.5 // indirect
128128
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
129-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
129+
github.com/pmezard/go-difflib v1.0.0 // indirect
130130
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
131-
github.com/prometheus/client_golang v1.19.1 // indirect
132-
github.com/prometheus/client_model v0.6.1 // indirect
133-
github.com/prometheus/common v0.55.0 // indirect
134-
github.com/prometheus/procfs v0.15.1 // indirect
131+
github.com/prometheus/client_golang v1.14.0 // indirect
132+
github.com/prometheus/client_model v0.3.0 // indirect
133+
github.com/prometheus/common v0.37.0 // indirect
134+
github.com/prometheus/procfs v0.8.0 // indirect
135135
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
136136
github.com/quasilyte/gogrep v0.5.0 // indirect
137137
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
@@ -143,22 +143,22 @@ require (
143143
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
144144
github.com/securego/gosec/v2 v2.15.0 // indirect
145145
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
146-
github.com/sirupsen/logrus v1.9.3 // indirect
146+
github.com/sirupsen/logrus v1.9.0 // indirect
147147
github.com/sivchari/containedctx v1.0.2 // indirect
148148
github.com/sivchari/nosnakecase v1.7.0 // indirect
149149
github.com/sivchari/tenv v1.7.1 // indirect
150150
github.com/sonatard/noctx v0.0.2 // indirect
151151
github.com/sourcegraph/go-diff v0.7.0 // indirect
152152
github.com/spf13/afero v1.8.2 // indirect
153153
github.com/spf13/cast v1.5.0 // indirect
154-
github.com/spf13/cobra v1.8.1 // indirect
154+
github.com/spf13/cobra v1.7.0 // indirect
155155
github.com/spf13/jwalterweatherman v1.1.0 // indirect
156156
github.com/spf13/pflag v1.0.5 // indirect
157157
github.com/spf13/viper v1.12.0 // indirect
158158
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
159159
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
160-
github.com/stretchr/objx v0.5.2 // indirect
161-
github.com/stretchr/testify v1.9.0 // indirect
160+
github.com/stretchr/objx v0.5.0 // indirect
161+
github.com/stretchr/testify v1.8.2 // indirect
162162
github.com/subosito/gotenv v1.4.1 // indirect
163163
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
164164
github.com/tdakkota/asciicheck v0.2.0 // indirect
@@ -170,34 +170,34 @@ require (
170170
github.com/ultraware/funlen v0.0.3 // indirect
171171
github.com/ultraware/whitespace v0.0.5 // indirect
172172
github.com/uudashr/gocognit v1.0.6 // indirect
173-
github.com/x448/float16 v0.8.4 // indirect
174173
github.com/yagipy/maintidx v1.0.0 // indirect
175174
github.com/yeya24/promlinter v0.2.0 // indirect
176175
gitlab.com/bosi/decorder v0.2.3 // indirect
177-
go.uber.org/multierr v1.11.0 // indirect
178-
go.uber.org/zap v1.26.0 // indirect
179-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
176+
go.uber.org/atomic v1.7.0 // indirect
177+
go.uber.org/multierr v1.6.0 // indirect
178+
go.uber.org/zap v1.24.0 // indirect
179+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
180180
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
181-
golang.org/x/mod v0.21.0 // indirect
182-
golang.org/x/net v0.30.0 // indirect
183-
golang.org/x/sync v0.8.0 // indirect
184-
golang.org/x/sys v0.26.0 // indirect
185-
golang.org/x/text v0.19.0 // indirect
186-
golang.org/x/tools v0.26.0 // indirect
181+
golang.org/x/mod v0.10.0 // indirect
182+
golang.org/x/net v0.9.0 // indirect
183+
golang.org/x/sync v0.1.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
187187
gopkg.in/inf.v0 v0.9.1 // indirect
188188
gopkg.in/ini.v1 v1.67.0 // indirect
189189
gopkg.in/yaml.v2 v2.4.0 // indirect
190190
gopkg.in/yaml.v3 v3.0.1 // indirect
191191
honnef.co/go/tools v0.4.3 // indirect
192-
k8s.io/api v0.31.2 // indirect
193-
k8s.io/apiextensions-apiserver v0.31.2 // indirect
194-
k8s.io/apimachinery v0.31.2 // indirect
195-
k8s.io/klog/v2 v2.130.1 // indirect
196-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // 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
195+
k8s.io/klog/v2 v2.90.1 // indirect
196+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
197197
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
198198
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
199199
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
200200
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
201-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
202-
sigs.k8s.io/yaml v1.4.0 // indirect
201+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
202+
sigs.k8s.io/yaml v1.3.0 // indirect
203203
)

0 commit comments

Comments
 (0)