Skip to content

Commit ab6aff1

Browse files
committed
Vendor cpsm and gjson/sjson packages
A reworking of how we match up generated and remote MachineSets now requires access to the availability zone (failure domain) of a MachineSet using the cluster-control-plane-machine-set-operator ProviderConfig interface. Vendoring this package also requires an update to controller-runtime which contains breaking changes. Additionally, the yaml-patch package has been abandoned and for the purposes of this solution, vendoring of gjson and sjson packages as replacements is necessary. Vendor all necessary packages. HIVE-2254 Signed-off-by: Leah Leshchinsky <[email protected]>
1 parent 35373d8 commit ab6aff1

File tree

158 files changed

+5277
-4958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+5277
-4958
lines changed

go.mod

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/miekg/dns v1.1.35
3333
github.com/modern-go/reflect2 v1.0.2
3434
github.com/onsi/ginkgo v1.16.5
35-
github.com/onsi/gomega v1.27.7
35+
github.com/onsi/gomega v1.27.10
3636
// go get -u github.com/openshift/[email protected]
3737
github.com/openshift/api v0.0.0-20230720094506-afcbe27aec7c
3838
github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533
@@ -76,8 +76,8 @@ require (
7676
k8s.io/kube-aggregator v0.28.3
7777
k8s.io/kubectl v0.28.3
7878
k8s.io/utils v0.0.0-20230505201702-9f6742963106
79-
sigs.k8s.io/controller-runtime v0.15.0
80-
sigs.k8s.io/controller-tools v0.10.0
79+
sigs.k8s.io/controller-runtime v0.16.3
80+
sigs.k8s.io/controller-tools v0.11.3
8181
sigs.k8s.io/yaml v1.3.0
8282
)
8383

@@ -90,6 +90,7 @@ require (
9090
github.com/curioswitch/go-reassign v0.2.0 // indirect
9191
github.com/denis-tingaikin/go-header v0.4.3 // indirect
9292
github.com/firefart/nonamedreturns v1.0.4 // indirect
93+
github.com/go-test/deep v1.1.0 // indirect
9394
github.com/hashicorp/go-version v1.6.0 // indirect
9495
github.com/hexops/gotextdiff v1.0.3 // indirect
9596
github.com/junk1tm/musttag v0.5.0 // indirect
@@ -175,7 +176,7 @@ require (
175176
github.com/go-toolsmith/strparse v1.1.0 // indirect
176177
github.com/go-toolsmith/typep v1.1.0 // indirect
177178
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
178-
github.com/gobuffalo/flect v0.2.5 // indirect
179+
github.com/gobuffalo/flect v0.3.0 // indirect
179180
github.com/gobwas/glob v0.2.3 // indirect
180181
github.com/gofrs/flock v0.8.1 // indirect
181182
github.com/gogo/protobuf v1.3.2 // indirect
@@ -202,7 +203,7 @@ require (
202203
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
203204
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
204205
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
205-
github.com/hashicorp/errwrap v1.0.0 // indirect
206+
github.com/hashicorp/errwrap v1.1.0 // indirect
206207
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
207208
github.com/hashicorp/go-multierror v1.1.1 // indirect
208209
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
@@ -309,15 +310,14 @@ require (
309310
go.opentelemetry.io/otel/trace v1.20.0 // indirect
310311
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
311312
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
312-
go.uber.org/atomic v1.10.0 // indirect
313313
go.uber.org/multierr v1.11.0 // indirect
314-
go.uber.org/zap v1.24.0 // indirect
314+
go.uber.org/zap v1.25.0 // indirect
315315
golang.org/x/sync v0.3.0 // indirect
316316
golang.org/x/sys v0.15.0 // indirect
317317
golang.org/x/term v0.15.0 // indirect
318318
golang.org/x/text v0.14.0 // indirect
319-
golang.org/x/tools v0.9.1 // indirect
320-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
319+
golang.org/x/tools v0.9.3 // indirect
320+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
321321
google.golang.org/appengine v1.6.7 // indirect
322322
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
323323
google.golang.org/grpc v1.59.0 // indirect
@@ -361,7 +361,7 @@ require (
361361
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
362362
github.com/cjlapao/common-go v0.0.29 // indirect
363363
github.com/containers/image v3.0.2+incompatible // indirect
364-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
364+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
365365
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
366366
github.com/go-logr/stdr v1.2.2 // indirect
367367
github.com/go-logr/zapr v1.2.4 // indirect
@@ -383,6 +383,7 @@ require (
383383
github.com/microsoftgraph/msgraph-sdk-go v0.47.0 // indirect
384384
github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1 // indirect
385385
github.com/opencontainers/go-digest v1.0.0 // indirect
386+
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20231107105652-3110ed81e74c
386387
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
387388
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
388389
github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -395,6 +396,7 @@ require (
395396
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
396397
github.com/tidwall/match v1.1.1 // indirect
397398
github.com/tidwall/pretty v1.2.0 // indirect
399+
github.com/tidwall/sjson v1.2.5
398400
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
399401
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
400402
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

go.sum

Lines changed: 28 additions & 21 deletions
Large diffs are not rendered by default.

pkg/test/manager/mock/manager_generated.go

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/v3/CHANGES.md

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/v3/README.md

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/v3/route.go

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/emicklei/go-restful/v3/route_builder.go

Lines changed: 28 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-test/deep/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-test/deep/CHANGES.md

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.uber.org/atomic/LICENSE.txt renamed to vendor/github.com/go-test/deep/LICENSE

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)