Skip to content

Commit a2b4aa0

Browse files
committed
Updating the machine-api-operator package
This commit vendors the machine-api-operator to include the new method from openshift/machine-api-operator#1147 and build the annotations for providing the architecture information to the kubernetes autoscaler.
1 parent b793cbd commit a2b4aa0

File tree

892 files changed

+87981
-61882
lines changed

Some content is hidden

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

892 files changed

+87981
-61882
lines changed

go.mod

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ go 1.19
55
require (
66
github.com/aws/aws-sdk-go v1.44.177
77
github.com/blang/semver v3.5.1+incompatible
8-
github.com/go-logr/logr v1.2.3
8+
github.com/go-logr/logr v1.2.4
99
github.com/golang/mock v1.6.0
10-
github.com/onsi/ginkgo/v2 v2.7.0
11-
github.com/onsi/gomega v1.24.2
12-
github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf
13-
github.com/openshift/machine-api-operator v0.2.1-0.20220922080915-f7f326323f37
14-
k8s.io/api v0.26.0
15-
k8s.io/apimachinery v0.26.0
16-
k8s.io/client-go v0.26.0
17-
k8s.io/klog/v2 v2.80.1
18-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
19-
sigs.k8s.io/controller-runtime v0.14.1
20-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230110013913-9fd57745d6e9
10+
github.com/onsi/ginkgo/v2 v2.9.5
11+
github.com/onsi/gomega v1.27.7
12+
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
13+
github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7
14+
k8s.io/api v0.27.2
15+
k8s.io/apimachinery v0.27.2
16+
k8s.io/client-go v0.27.2
17+
k8s.io/klog/v2 v2.100.1
18+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
19+
sigs.k8s.io/controller-runtime v0.15.0
20+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230523032821-116a1b831fff
2121
sigs.k8s.io/controller-tools v0.11.1
2222
)
2323

@@ -32,18 +32,18 @@ require (
3232
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3333
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3434
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
35-
github.com/fatih/color v1.13.0 // indirect
35+
github.com/fatih/color v1.15.0 // indirect
3636
github.com/fsnotify/fsnotify v1.6.0 // indirect
3737
github.com/go-errors/errors v1.4.2 // indirect
38-
github.com/go-logr/zapr v1.2.3 // indirect
38+
github.com/go-logr/zapr v1.2.4 // indirect
3939
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4040
github.com/go-openapi/jsonreference v0.20.1 // indirect
4141
github.com/go-openapi/swag v0.22.3 // indirect
42-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
42+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4343
github.com/gobuffalo/flect v0.3.0 // indirect
4444
github.com/gogo/protobuf v1.3.2 // indirect
4545
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
46-
github.com/golang/protobuf v1.5.2 // indirect
46+
github.com/golang/protobuf v1.5.3 // indirect
4747
github.com/google/btree v1.1.2 // indirect
4848
github.com/google/gnostic v0.6.9 // indirect
4949
github.com/google/go-cmp v0.5.9 // indirect
@@ -59,8 +59,8 @@ require (
5959
github.com/json-iterator/go v1.1.12 // indirect
6060
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6161
github.com/mailru/easyjson v0.7.7 // indirect
62-
github.com/mattn/go-colorable v0.1.9 // indirect
63-
github.com/mattn/go-isatty v0.0.14 // indirect
62+
github.com/mattn/go-colorable v0.1.13 // indirect
63+
github.com/mattn/go-isatty v0.0.17 // indirect
6464
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6565
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6666
github.com/moby/spdystream v0.2.0 // indirect
@@ -69,13 +69,13 @@ require (
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7171
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
72-
github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e // indirect
73-
github.com/openshift/library-go v0.0.0-20230110214128-d589dfa7b44a // indirect
72+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb // indirect
73+
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf // indirect
7474
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_golang v1.14.0 // indirect
77-
github.com/prometheus/client_model v0.3.0 // indirect
78-
github.com/prometheus/common v0.39.0 // indirect
76+
github.com/prometheus/client_golang v1.15.1 // indirect
77+
github.com/prometheus/client_model v0.4.0 // indirect
78+
github.com/prometheus/common v0.42.0 // indirect
7979
github.com/prometheus/procfs v0.9.0 // indirect
8080
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8181
github.com/spf13/afero v1.9.3 // indirect
@@ -86,28 +86,28 @@ require (
8686
go.uber.org/atomic v1.10.0 // indirect
8787
go.uber.org/multierr v1.9.0 // indirect
8888
go.uber.org/zap v1.24.0 // indirect
89-
golang.org/x/mod v0.8.0 // indirect
90-
golang.org/x/net v0.9.0 // indirect
91-
golang.org/x/oauth2 v0.4.0 // indirect
92-
golang.org/x/sys v0.7.0 // indirect
93-
golang.org/x/term v0.7.0 // indirect
89+
golang.org/x/mod v0.10.0 // indirect
90+
golang.org/x/net v0.10.0 // indirect
91+
golang.org/x/oauth2 v0.6.0 // indirect
92+
golang.org/x/sys v0.8.0 // indirect
93+
golang.org/x/term v0.8.0 // indirect
9494
golang.org/x/text v0.9.0 // indirect
9595
golang.org/x/time v0.3.0 // indirect
96-
golang.org/x/tools v0.6.0 // indirect
97-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
96+
golang.org/x/tools v0.9.1 // indirect
97+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
9898
google.golang.org/appengine v1.6.7 // indirect
99-
google.golang.org/protobuf v1.28.1 // indirect
99+
google.golang.org/protobuf v1.30.0 // indirect
100100
gopkg.in/inf.v0 v0.9.1 // indirect
101101
gopkg.in/yaml.v2 v2.4.0 // indirect
102102
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/apiextensions-apiserver v0.26.0 // indirect
104-
k8s.io/cli-runtime v0.26.0 // indirect
105-
k8s.io/component-base v0.26.0 // indirect
106-
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
107-
k8s.io/kubectl v0.26.0 // indirect
103+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
104+
k8s.io/cli-runtime v0.27.1 // indirect
105+
k8s.io/component-base v0.27.2 // indirect
106+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
107+
k8s.io/kubectl v0.27.1 // indirect
108108
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
110-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
109+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
110+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
111111
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
112112
sigs.k8s.io/yaml v1.3.0 // indirect
113113
)

0 commit comments

Comments
 (0)