Skip to content

Commit

Permalink
Vendor cpsm and gjson/sjson packages
Browse files Browse the repository at this point in the history
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 <lleshchi@redhat.com>
  • Loading branch information
lleshchi committed Jan 27, 2024
1 parent 7b4905c commit 0aacdcf
Show file tree
Hide file tree
Showing 158 changed files with 5,277 additions and 4,958 deletions.
22 changes: 12 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/miekg/dns v1.1.35
github.com/modern-go/reflect2 v1.0.2
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.7
github.com/onsi/gomega v1.27.10
// go get -u github.com/openshift/api@relase-4.13
github.com/openshift/api v0.0.0-20230720094506-afcbe27aec7c
github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533
Expand Down Expand Up @@ -76,8 +76,8 @@ require (
k8s.io/kube-aggregator v0.28.3
k8s.io/kubectl v0.28.3
k8s.io/utils v0.0.0-20230505201702-9f6742963106
sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/controller-tools v0.10.0
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/controller-tools v0.11.3
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -90,6 +90,7 @@ require (
github.com/curioswitch/go-reassign v0.2.0 // indirect
github.com/denis-tingaikin/go-header v0.4.3 // indirect
github.com/firefart/nonamedreturns v1.0.4 // indirect
github.com/go-test/deep v1.1.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/junk1tm/musttag v0.5.0 // indirect
Expand Down Expand Up @@ -175,7 +176,7 @@ require (
github.com/go-toolsmith/strparse v1.1.0 // indirect
github.com/go-toolsmith/typep v1.1.0 // indirect
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -202,7 +203,7 @@ require (
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
Expand Down Expand Up @@ -309,15 +310,14 @@ require (
go.opentelemetry.io/otel/trace v1.20.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
golang.org/x/tools v0.9.3 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
Expand Down Expand Up @@ -361,7 +361,7 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cjlapao/common-go v0.0.29 // indirect
github.com/containers/image v3.0.2+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
Expand All @@ -383,6 +383,7 @@ require (
github.com/microsoftgraph/msgraph-sdk-go v0.47.0 // indirect
github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20231107105652-3110ed81e74c
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/quasilyte/gogrep v0.5.0 // indirect
Expand All @@ -395,6 +396,7 @@ require (
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/sjson v1.2.5
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
Expand Down
49 changes: 28 additions & 21 deletions go.sum

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions pkg/test/manager/mock/manager_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion vendor/github.com/emicklei/go-restful/v3/CHANGES.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/github.com/emicklei/go-restful/v3/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions vendor/github.com/emicklei/go-restful/v3/route.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 28 additions & 17 deletions vendor/github.com/emicklei/go-restful/v3/route_builder.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/go-test/deep/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions vendor/github.com/go-test/deep/CHANGES.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions vendor/github.com/go-test/deep/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0aacdcf

Please sign in to comment.