Skip to content

Commit 07297a6

Browse files
Revendor MAO Pausig changes
This revendors the MAO to bring in the recent Paused Condition changes: openshift/machine-api-operator#1287 openshift/machine-api-operator#1286
1 parent b6c35e8 commit 07297a6

36 files changed

+1382
-553
lines changed

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
github.com/mitchellh/mapstructure v1.5.0
1717
github.com/onsi/ginkgo/v2 v2.19.0
1818
github.com/onsi/gomega v1.33.1
19-
github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215
20-
github.com/openshift/machine-api-operator v0.2.1-0.20240813104042-5af274324af8
19+
github.com/openshift/api v0.0.0-20240904015708-69df64132c91
20+
github.com/openshift/machine-api-operator v0.2.1-0.20240912100427-050b12eb6e05
2121
github.com/pkg/errors v0.9.1
2222
github.com/spf13/cobra v1.8.0
2323
golang.org/x/crypto v0.24.0
@@ -38,7 +38,7 @@ require (
3838
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
3939
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
4040
github.com/jongio/azidext/go/azidext v0.5.0
41-
github.com/openshift/library-go v0.0.0-20240822162747-42bcbbc4ccc6
41+
github.com/openshift/library-go v0.0.0-20240903143724-7c5c5d305ac1
4242
go.uber.org/mock v0.4.0
4343
k8s.io/apiserver v0.30.1
4444
k8s.io/component-base v0.30.2
@@ -64,7 +64,7 @@ require (
6464
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6565
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6666
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
67-
github.com/fatih/color v1.16.0 // indirect
67+
github.com/fatih/color v1.17.0 // indirect
6868
github.com/fsnotify/fsnotify v1.7.0 // indirect
6969
github.com/go-errors/errors v1.4.2 // indirect
7070
github.com/go-logr/zapr v1.3.0 // indirect
@@ -104,21 +104,21 @@ require (
104104
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
105105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
106106
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
107-
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 // indirect
107+
github.com/openshift/client-go v0.0.0-20240904134955-cd42fd3d7408 // indirect
108108
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
109109
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
110110
github.com/prometheus/client_golang v1.18.0 // indirect
111111
github.com/prometheus/client_model v0.5.0 // indirect
112112
github.com/prometheus/common v0.45.0 // indirect
113113
github.com/prometheus/procfs v0.12.0 // indirect
114114
github.com/russross/blackfriday/v2 v2.1.0 // indirect
115-
github.com/spf13/afero v1.10.0 // indirect
115+
github.com/spf13/afero v1.11.0 // indirect
116116
github.com/spf13/pflag v1.0.5 // indirect
117117
github.com/xlab/treeprint v1.2.0 // indirect
118118
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
119119
go.uber.org/multierr v1.11.0 // indirect
120120
go.uber.org/zap v1.26.0 // indirect
121-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
121+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
122122
golang.org/x/mod v0.17.0 // indirect
123123
golang.org/x/net v0.26.0 // indirect
124124
golang.org/x/oauth2 v0.18.0 // indirect

go.sum

Lines changed: 20 additions & 346 deletions
Large diffs are not rendered by default.

vendor/github.com/fatih/color/color.go

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

vendor/github.com/openshift/api/config/v1/types_feature.go

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

vendor/github.com/openshift/api/config/v1/types_image.go

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

vendor/github.com/openshift/api/config/v1/types_infrastructure.go

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

vendor/github.com/openshift/api/config/v1/types_network.go

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

vendor/github.com/openshift/api/config/v1/types_node.go

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

vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates.crd.yaml

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

0 commit comments

Comments
 (0)