Skip to content

Commit d7245e0

Browse files
authored
Merge pull request #708 from Vincent056/update_mco
OCPBUGS-54403: Update MCO dependency to support 3.5 ignition
2 parents 003f701 + bf96264 commit d7245e0

File tree

233 files changed

+6453
-2437
lines changed

Some content is hidden

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

233 files changed

+6453
-2437
lines changed

go.mod

+44-50
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ go 1.23.0
55
require (
66
github.com/cenkalti/backoff/v4 v4.3.0
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/ginkgo/v2 v2.22.2
98
github.com/onsi/gomega v1.36.2
10-
k8s.io/apimachinery v0.32.1
9+
k8s.io/apimachinery v0.32.3
1110
k8s.io/client-go v0.32.1
1211
open-cluster-management.io/api v0.15.0
1312
sigs.k8s.io/controller-runtime v0.20.2
@@ -16,38 +15,35 @@ require (
1615
require (
1716
cloud.google.com/go v0.116.0 // indirect
1817
cloud.google.com/go/ai v0.8.0 // indirect
19-
cloud.google.com/go/auth v0.13.0 // indirect
20-
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
18+
cloud.google.com/go/auth v0.15.0 // indirect
19+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
2120
cloud.google.com/go/compute/metadata v0.6.0 // indirect
2221
cloud.google.com/go/longrunning v0.5.7 // indirect
23-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
24-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
22+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
23+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
2524
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
26-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
25+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
2726
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
2827
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2928
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
30-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
3129
github.com/dennwc/varint v1.0.0 // indirect
3230
github.com/edsrzf/mmap-go v1.2.0 // indirect
33-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
31+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
3432
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
3533
github.com/felixge/httpsnoop v1.0.4 // indirect
36-
github.com/go-kit/log v0.2.1 // indirect
37-
github.com/go-logfmt/logfmt v0.6.0 // indirect
3834
github.com/go-logr/stdr v1.2.2 // indirect
39-
github.com/go-openapi/analysis v0.22.2 // indirect
35+
github.com/go-openapi/analysis v0.23.0 // indirect
4036
github.com/go-openapi/errors v0.22.0 // indirect
41-
github.com/go-openapi/loads v0.21.5 // indirect
42-
github.com/go-openapi/spec v0.20.14 // indirect
37+
github.com/go-openapi/loads v0.22.0 // indirect
38+
github.com/go-openapi/spec v0.21.0 // indirect
4339
github.com/go-openapi/strfmt v0.23.0 // indirect
44-
github.com/go-openapi/validate v0.23.0 // indirect
40+
github.com/go-openapi/validate v0.24.0 // indirect
4541
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
4642
github.com/golang/snappy v0.0.4 // indirect
4743
github.com/google/btree v1.1.3 // indirect
4844
github.com/google/generative-ai-go v0.19.0 // indirect
49-
github.com/google/s2a-go v0.1.8 // indirect
50-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
45+
github.com/google/s2a-go v0.1.9 // indirect
46+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
5147
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
5248
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5349
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -60,37 +56,35 @@ require (
6056
github.com/oklog/ulid v1.3.1 // indirect
6157
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
6258
github.com/prometheus/alertmanager v0.27.0 // indirect
63-
github.com/prometheus/common/sigv4 v0.1.0 // indirect
6459
github.com/prometheus/sigv4 v0.1.0 // indirect
6560
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a // indirect
6661
go.mongodb.org/mongo-driver v1.14.0 // indirect
6762
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6863
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
6964
go.opentelemetry.io/collector/semconv v0.116.0 // indirect
70-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
65+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
7166
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.58.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
73-
go.opentelemetry.io/otel v1.33.0 // indirect
74-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
75-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
67+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
68+
go.opentelemetry.io/otel v1.34.0 // indirect
69+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
7671
go.uber.org/atomic v1.11.0 // indirect
7772
go.uber.org/goleak v1.3.0 // indirect
78-
golang.org/x/crypto v0.35.0 // indirect
79-
google.golang.org/api v0.215.0 // indirect
73+
golang.org/x/crypto v0.36.0 // indirect
74+
google.golang.org/api v0.224.0 // indirect
8075
google.golang.org/genproto/googleapis/api v0.0.0-20241216192217-9240e9c98484 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
82-
google.golang.org/grpc v1.69.0 // indirect
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
77+
google.golang.org/grpc v1.70.0 // indirect
8378
)
8479

8580
require (
8681
github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 // indirect
8782
github.com/antchfx/xmlquery v1.4.3
8883
github.com/beorn7/perks v1.0.1 // indirect
8984
github.com/blang/semver/v4 v4.0.0
90-
github.com/cenkalti/backoff/v5 v5.0.1
9185
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9286
github.com/clarketm/json v1.17.1
93-
github.com/coreos/ignition/v2 v2.20.0
87+
github.com/coreos/ignition/v2 v2.21.0
9488
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9589
github.com/dsnet/compress v0.0.1
9690
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
@@ -100,7 +94,7 @@ require (
10094
github.com/gogo/protobuf v1.3.2 // indirect
10195
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10296
github.com/golang/protobuf v1.5.4 // indirect
103-
github.com/google/go-cmp v0.6.0
97+
github.com/google/go-cmp v0.7.0
10498
github.com/google/gofuzz v1.2.0 // indirect
10599
github.com/google/uuid v1.6.0
106100
github.com/imdario/mergo v0.3.16 // indirect
@@ -111,62 +105,62 @@ require (
111105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
112106
github.com/modern-go/reflect2 v1.0.2 // indirect
113107
github.com/nxadm/tail v1.4.8 // indirect
114-
github.com/openshift/api v0.0.0-20250120092857-366ffb8c60da
115-
github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc
116-
github.com/openshift/machine-config-operator v0.0.1-0.20250106175656-2d1f23a7513e
108+
github.com/openshift/api v0.0.0-20250320115527-3aa9dd5b9002
109+
github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70
110+
github.com/openshift/machine-config-operator v0.0.1-0.20250401081735-9026ff2d802e
117111
github.com/pborman/uuid v1.2.1
118112
github.com/pkg/errors v0.9.1
119113
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2
120114
github.com/prometheus-operator/prometheus-operator/pkg/client v0.79.2
121115
github.com/prometheus/client_golang v1.20.5
122116
github.com/prometheus/client_model v0.6.1
123-
github.com/prometheus/common v0.61.0 // indirect
117+
github.com/prometheus/common v0.62.0 // indirect
124118
github.com/prometheus/procfs v0.15.1 // indirect
125119
github.com/robfig/cron/v3 v3.0.1
126120
github.com/securego/gosec/v2 v2.22.0
127121
github.com/sirupsen/logrus v1.9.3
128122
github.com/spf13/cobra v1.8.1
129-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
123+
github.com/spf13/pflag v1.0.6 // indirect
130124
github.com/stretchr/testify v1.10.0
131125
go.uber.org/multierr v1.11.0 // indirect
132126
go.uber.org/zap v1.27.0
133127
golang.org/x/mod v0.22.0
134-
golang.org/x/net v0.36.0
135-
golang.org/x/oauth2 v0.25.0 // indirect
136-
golang.org/x/sys v0.30.0 // indirect
137-
golang.org/x/term v0.29.0 // indirect
138-
golang.org/x/text v0.22.0 // indirect
139-
golang.org/x/time v0.8.0 // indirect
128+
golang.org/x/net v0.37.0
129+
golang.org/x/oauth2 v0.28.0 // indirect
130+
golang.org/x/sys v0.31.0 // indirect
131+
golang.org/x/term v0.30.0 // indirect
132+
golang.org/x/text v0.23.0 // indirect
133+
golang.org/x/time v0.10.0 // indirect
140134
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141-
google.golang.org/protobuf v1.36.2 // indirect
135+
google.golang.org/protobuf v1.36.5 // indirect
142136
gopkg.in/inf.v0 v0.9.1 // indirect
143137
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
144138
gopkg.in/yaml.v2 v2.4.0 // indirect
145139
gopkg.in/yaml.v3 v3.0.1
146-
k8s.io/api v0.32.1
140+
k8s.io/api v0.32.3
147141
k8s.io/apiextensions-apiserver v0.32.1
148142
k8s.io/apiserver v0.32.1
149143
k8s.io/component-base v0.32.1 // indirect
150144
k8s.io/klog/v2 v2.130.1 // indirect
151-
k8s.io/kube-openapi v0.0.0-20241212045625-5ad02ce6640f // indirect
145+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
152146
k8s.io/pod-security-admission v0.32.1
153147
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
154148
sigs.k8s.io/controller-tools v0.17.1
155149
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
156-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
150+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
157151
sigs.k8s.io/yaml v1.4.0
158152
)
159153

160154
require (
161155
github.com/antchfx/xpath v1.3.3 // indirect
162-
github.com/aws/aws-sdk-go v1.55.5 // indirect
156+
github.com/aws/aws-sdk-go v1.55.6 // indirect
163157
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
164158
github.com/coreos/fcct v0.5.0 // indirect
165159
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
166160
github.com/coreos/go-semver v0.3.1 // indirect
167161
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
168162
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
169-
github.com/coreos/ign-converter v0.0.0-20230417193809-cee89ea7d8ff // indirect
163+
github.com/coreos/ign-converter v0.0.0-20241125185625-2f773079ca81 // indirect
170164
github.com/coreos/ignition v0.35.0 // indirect
171165
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
172166
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
@@ -189,7 +183,7 @@ require (
189183
github.com/mattn/go-runewidth v0.0.16 // indirect
190184
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
191185
github.com/olekukonko/tablewriter v0.0.5 // indirect
192-
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 // indirect
186+
github.com/openshift/client-go v0.0.0-20250324153519-f0faeb0f2f2e // indirect
193187
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
194188
github.com/prometheus/prometheus v0.301.0
195189
github.com/rivo/uniseg v0.4.7 // indirect
@@ -200,10 +194,10 @@ require (
200194
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
201195
go4.org v0.0.0-20200104003542-c7e774b10ea0 // indirect
202196
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
203-
golang.org/x/sync v0.11.0 // indirect
197+
golang.org/x/sync v0.12.0 // indirect
204198
golang.org/x/tools v0.29.0 // indirect
205199
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
206-
k8s.io/kube-aggregator v0.31.1 // indirect
200+
k8s.io/kube-aggregator v0.32.1 // indirect
207201
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
208202
)
209203

0 commit comments

Comments
 (0)