Skip to content

Commit

Permalink
Merge pull request #2485 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history 
…2484-to-mce-2.6

[mce-2.6] Revendor cluster-control-plane-machine-set-operator
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Oct 3, 2024
2 parents 9cd3a4f + 021d4cc commit c8cf8d1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ require (
github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240311123436-a58712e5c221
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240417192557-2b86969aeeee
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/quasilyte/gogrep v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1748,8 +1748,8 @@ github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850d
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519/go.mod h1:C7unCUThP8eqT4xQfbvg3oIDn2S9TYtb0wbBoH/SR2U=
github.com/openshift/cluster-autoscaler-operator v0.0.0-20211006175002-fe524080b551 h1:nGa6igwzG7smZOACUsovgf9XG8vT96Zdyc4H6r2rqS0=
github.com/openshift/cluster-autoscaler-operator v0.0.0-20211006175002-fe524080b551/go.mod h1:72ieWchfTx9U7UbQO47vhSXBoCi2IJGZhXoCezan4EM=
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240311123436-a58712e5c221 h1:MeWBjqH/e9ULu6Myaka/5lLDqxr2YJvXtxJpBjrfcT0=
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240311123436-a58712e5c221/go.mod h1:fWDEaNFwshqjvE9irbMYjg5pBI+HS2TnWQGpoI/ARto=
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240417192557-2b86969aeeee h1:golYbp3OK7U6XcsDhkjheQ55o3XjJRt6HPpVzN5F6Pg=
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240417192557-2b86969aeeee/go.mod h1:fWDEaNFwshqjvE9irbMYjg5pBI+HS2TnWQGpoI/ARto=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 h1:cHyxR+Y8rAMT6m1jQCaYGRwikqahI0OjjUDhFNf3ySQ=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
github.com/openshift/generic-admission-server v1.14.1-0.20231020105858-8dcc3c9b298f h1:LzKRLvLJkWW4+4KsuvMmXJQ81ZZJSm2xxu6jwtn5gN0=
Expand Down
5 changes: 5 additions & 0 deletions ...erator/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go
View file

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9250,7 +9250,7 @@ github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1
## explicit; go 1.16
github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1
github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1beta1
# github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240311123436-a58712e5c221
# github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20240417192557-2b86969aeeee
## explicit; go 1.21
github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/failuredomain
github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig
Expand Down

0 comments on commit c8cf8d1

Please sign in to comment.