Skip to content

Commit 68981c8

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #3338 from jrvaldes/handle-hns-removal
[vendor] bump coreos/ignition/v2 to v2.23.0
2 parents 9d216af + f4064b1 commit 68981c8

File tree

58 files changed

+1206
-770
lines changed

Some content is hidden

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

58 files changed

+1206
-770
lines changed

‎go.mod‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ replace (
1616
require (
1717
github.com/apparentlymart/go-cidr v1.1.0
1818
github.com/aws/aws-sdk-go v1.55.8
19-
github.com/coreos/ignition/v2 v2.22.0
19+
github.com/coreos/ignition/v2 v2.23.0
2020
github.com/go-imports-organizer/goio v1.5.0
2121
github.com/go-logr/logr v1.4.3
2222
github.com/openshift/api v0.0.0-20250901120840-a638ff2e96fb
@@ -50,10 +50,11 @@ require (
5050
)
5151

5252
require (
53-
cel.dev/expr v0.20.0 // indirect
53+
cel.dev/expr v0.24.0 // indirect
5454
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5555
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5656
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
57+
github.com/aws/aws-sdk-go-v2 v1.38.2 // indirect
5758
github.com/beorn7/perks v1.0.1 // indirect
5859
github.com/blang/semver/v4 v4.0.0 // indirect
5960
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -119,7 +120,7 @@ require (
119120
github.com/x448/float16 v0.8.4 // indirect
120121
github.com/xlab/treeprint v1.2.0 // indirect
121122
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
122-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
123+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
123124
go.opentelemetry.io/otel v1.36.0 // indirect
124125
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
125126
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
@@ -136,11 +137,11 @@ require (
136137
golang.org/x/sync v0.17.0 // indirect
137138
golang.org/x/term v0.35.0 // indirect
138139
golang.org/x/text v0.29.0 // indirect
139-
golang.org/x/time v0.11.0 // indirect
140+
golang.org/x/time v0.12.0 // indirect
140141
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
143-
google.golang.org/grpc v1.72.2 // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
144+
google.golang.org/grpc v1.74.2 // indirect
144145
google.golang.org/protobuf v1.36.8 // indirect
145146
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
146147
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
2-
cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
1+
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2+
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
55
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -72,6 +72,8 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l
7272
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
7373
github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
7474
github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
75+
github.com/aws/aws-sdk-go-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJLMyM=
76+
github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
7577
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
7678
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
7779
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -117,8 +119,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
117119
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
118120
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 h1:OoRAFlvDGCUqDLampLQjk0yeeSGdF9zzst/3G9IkBbc=
119121
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09/go.mod h1:m2r/smMKsKwgMSAoFKHaa68ImdCSNuKE1MxvQ64xuCQ=
120-
github.com/coreos/ignition/v2 v2.22.0 h1:DcVOKStjs0Qaz8F2bTX0jD0YDRLlzkIwON42502Fkuo=
121-
github.com/coreos/ignition/v2 v2.22.0/go.mod h1:renvkPY1eRngVQvDFjQai+/EHPXEVb4VO3v5tcERfZ8=
122+
github.com/coreos/ignition/v2 v2.23.0 h1:p/94m/jLU8PuOvgQmcTwdCS/jaSQClnU2uYQ82VuP2w=
123+
github.com/coreos/ignition/v2 v2.23.0/go.mod h1:I75u/02g4G1qkgdWOtcbn4oF4d4L9VC5jtkpAlgAHnk=
122124
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
123125
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
124126
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
@@ -714,8 +716,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
714716
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
715717
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
716718
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
717-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
718-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
719+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
720+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
719721
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
720722
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
721723
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
@@ -1047,8 +1049,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
10471049
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10481050
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10491051
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
1050-
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
1051-
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
1052+
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
1053+
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
10521054
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
10531055
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
10541056
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1158,10 +1160,10 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG
11581160
google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
11591161
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
11601162
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
1161-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 h1:WvBuA5rjZx9SNIzgcU53OohgZy6lKSus++uY4xLaWKc=
1162-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:W3S/3np0/dPWsWLi1h/UymYctGXaGBM2StwzD0y140U=
1163-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
1164-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
1163+
google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074 h1:mVXdvnmR3S3BQOqHECm9NGMjYiRtEvDYcqAqedTXY6s=
1164+
google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074/go.mod h1:vYFwMYFbmA8vl6Z/krj/h7+U/AqpHknwJX4Uqgfyc7I=
1165+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 h1:qJW29YvkiJmXOYMu5Tf8lyrTp3dOS+K4z6IixtLaCf8=
1166+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
11651167
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
11661168
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
11671169
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1171,8 +1173,8 @@ google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
11711173
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
11721174
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
11731175
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
1174-
google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
1175-
google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
1176+
google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
1177+
google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
11761178
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
11771179
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
11781180
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎vendor/cel.dev/expr/.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
7.0.1
1+
7.3.2
22
# Keep this pinned version in parity with cel-go

‎vendor/cel.dev/expr/MODULE.bazel‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,38 @@ bazel_dep(
88
)
99
bazel_dep(
1010
name = "gazelle",
11-
version = "0.36.0",
11+
version = "0.39.1",
1212
repo_name = "bazel_gazelle",
1313
)
1414
bazel_dep(
1515
name = "googleapis",
16-
version = "0.0.0-20240819-fe8ba054a",
16+
version = "0.0.0-20241220-5e258e33.bcr.1",
1717
repo_name = "com_google_googleapis",
1818
)
19+
bazel_dep(
20+
name = "googleapis-cc",
21+
version = "1.0.0",
22+
)
23+
bazel_dep(
24+
name = "googleapis-java",
25+
version = "1.0.0",
26+
)
27+
bazel_dep(
28+
name = "googleapis-go",
29+
version = "1.0.0",
30+
)
1931
bazel_dep(
2032
name = "protobuf",
21-
version = "26.0",
33+
version = "27.0",
2234
repo_name = "com_google_protobuf",
2335
)
2436
bazel_dep(
2537
name = "rules_cc",
26-
version = "0.0.9",
38+
version = "0.0.17",
2739
)
2840
bazel_dep(
2941
name = "rules_go",
30-
version = "0.49.0",
42+
version = "0.53.0",
3143
repo_name = "io_bazel_rules_go",
3244
)
3345
bazel_dep(
@@ -36,7 +48,7 @@ bazel_dep(
3648
)
3749
bazel_dep(
3850
name = "rules_proto",
39-
version = "6.0.0",
51+
version = "7.0.2",
4052
)
4153
bazel_dep(
4254
name = "rules_python",
@@ -50,16 +62,8 @@ python.toolchain(
5062
python_version = "3.11",
5163
)
5264

53-
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
54-
switched_rules.use_languages(
55-
cc = True,
56-
go = True,
57-
java = True,
58-
)
59-
use_repo(switched_rules, "com_google_googleapis_imports")
60-
6165
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
62-
go_sdk.download(version = "1.21.1")
66+
go_sdk.download(version = "1.22.0")
6367

6468
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
6569
go_deps.from_file(go_mod = "//:go.mod")

‎vendor/cel.dev/expr/cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- name: 'gcr.io/cloud-builders/bazel:7.0.1'
2+
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
33
entrypoint: bazel
44
args: ['build', '...']
55
id: bazel-build

0 commit comments

Comments
 (0)