Skip to content

Commit d0aabcc

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #9329 from patrickdillon/az-mkt-imgs
CORS-3652: RHCOS Stream Marketplace Images
2 parents 6bdcd87 + 0fb323e commit d0aabcc

File tree

190 files changed

+50158
-1465
lines changed

Some content is hidden

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

190 files changed

+50158
-1465
lines changed

‎data/data/coreos/marketplace-rhcos.json‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
{
2+
"aarch64": {
3+
"azure": {
4+
"no-purchase-plan": {
5+
"hyperVGen2": {
6+
"publisher": "azureopenshift",
7+
"offer": "aro4",
8+
"sku": "419-arm",
9+
"version": "419.6.20250523"
10+
}
11+
}
12+
}
13+
},
14+
"x86_64": {
15+
"azure": {
16+
"no-purchase-plan": {
17+
"hyperVGen1": {
18+
"publisher": "azureopenshift",
19+
"offer": "aro4",
20+
"sku": "aro_419",
21+
"version": "419.6.20250523"
22+
},
23+
"hyperVGen2": {
24+
"publisher": "azureopenshift",
25+
"offer": "aro4",
26+
"sku": "419-v2",
27+
"version": "419.6.20250523"
28+
}
29+
},
30+
"ocp": {
31+
"hyperVGen1": {
32+
"publisher": "redhat",
33+
"offer": "rh-ocp-worker",
34+
"sku": "rh-ocp-worker-gen1",
35+
"version": "4.18.2025031114"
36+
},
37+
"hyperVGen2": {
38+
"publisher": "redhat",
39+
"offer": "rh-ocp-worker",
40+
"sku": "rh-ocp-worker",
41+
"version": "4.18.2025031114"
42+
}
43+
},
44+
"opp": {
45+
"hyperVGen1": {
46+
"publisher": "redhat",
47+
"offer": "rh-opp-worker",
48+
"sku": "rh-opp-worker-gen1",
49+
"version": "4.18.2025031114"
50+
},
51+
"hyperVGen2": {
52+
"publisher": "redhat",
53+
"offer": "rh-opp-worker",
54+
"sku": "rh-opp-worker",
55+
"version": "4.18.2025031114"
56+
}
57+
},
58+
"oke": {
59+
"hyperVGen1": {
60+
"publisher": "redhat",
61+
"offer": "rh-oke-worker",
62+
"sku": "rh-oke-worker-gen1",
63+
"version": "4.18.2025031114"
64+
},
65+
"hyperVGen2": {
66+
"publisher": "redhat",
67+
"offer": "rh-oke-worker",
68+
"sku": "rh-oke-worker",
69+
"version": "4.18.2025031114"
70+
}
71+
},
72+
"ocp-emea": {
73+
"hyperVGen1": {
74+
"publisher": "redhat-limited",
75+
"offer": "rh-ocp-worker",
76+
"sku": "rh-ocp-worker-gen1",
77+
"version": "4.18.2025031114"
78+
},
79+
"hyperVGen2": {
80+
"publisher": "redhat-limited",
81+
"offer": "rh-ocp-worker",
82+
"sku": "rh-ocp-worker",
83+
"version": "4.18.2025031114"
84+
}
85+
},
86+
"opp-emea": {
87+
"hyperVGen1": {
88+
"publisher": "redhat-limited",
89+
"offer": "rh-opp-worker",
90+
"sku": "rh-opp-worker-gen1",
91+
"version": "4.18.2025031114"
92+
},
93+
"hyperVGen2": {
94+
"publisher": "redhat-limited",
95+
"offer": "rh-opp-worker",
96+
"sku": "rh-opp-worker",
97+
"version": "4.18.2025031114"
98+
}
99+
},
100+
"oke-emea": {
101+
"hyperVGen1": {
102+
"publisher": "redhat-limited",
103+
"offer": "rh-oke-worker",
104+
"sku": "rh-oke-worker-gen1",
105+
"version": "4.18.2025031114"
106+
},
107+
"hyperVGen2": {
108+
"publisher": "redhat-limited",
109+
"offer": "rh-oke-worker",
110+
"sku": "rh-oke-worker",
111+
"version": "4.18.2025031114"
112+
}
113+
}
114+
}
115+
}
116+
}

‎go.mod‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
cloud.google.com/go/storage v1.43.0
1111
github.com/AlecAivazis/survey/v2 v2.3.5
1212
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
13-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
14-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
13+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
14+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
1515
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.2
1616
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1
1717
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0
@@ -52,7 +52,7 @@ require (
5252
github.com/clarketm/json v1.14.1
5353
github.com/containers/image/v5 v5.31.0
5454
github.com/coreos/ignition/v2 v2.20.0
55-
github.com/coreos/stream-metadata-go v0.1.8
55+
github.com/coreos/stream-metadata-go v0.4.10-0.20250806142651-4a7d280a6c7b
5656
github.com/daixiang0/gci v0.13.4
5757
github.com/digitalocean/go-libvirt v0.0.0-20240220204746-fcabe97a6eed
5858
github.com/diskfs/go-diskfs v1.4.0
@@ -117,12 +117,12 @@ require (
117117
github.com/vincent-petithory/dataurl v1.0.0
118118
github.com/vmware/govmomi v0.47.1
119119
go.uber.org/mock v0.5.0
120-
golang.org/x/crypto v0.36.0
120+
golang.org/x/crypto v0.38.0
121121
golang.org/x/oauth2 v0.28.0
122-
golang.org/x/sync v0.12.0
123-
golang.org/x/sys v0.32.0
124-
golang.org/x/term v0.30.0
125-
golang.org/x/text v0.23.0
122+
golang.org/x/sync v0.14.0
123+
golang.org/x/sys v0.33.0
124+
golang.org/x/term v0.32.0
125+
golang.org/x/text v0.25.0
126126
google.golang.org/api v0.214.0
127127
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a
128128
google.golang.org/grpc v1.71.0
@@ -150,7 +150,10 @@ require (
150150
sigs.k8s.io/yaml v1.4.0
151151
)
152152

153-
require github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0
153+
require (
154+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0
155+
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0
156+
)
154157

155158
require github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0
156159

@@ -161,15 +164,15 @@ require (
161164
cloud.google.com/go/compute/metadata v0.6.0 // indirect
162165
cloud.google.com/go/iam v1.2.2 // indirect
163166
cloud.google.com/go/longrunning v0.6.2 // indirect
164-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
167+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
165168
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
166169
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
167170
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
168171
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
169172
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
170173
github.com/Azure/go-autorest/logger v0.2.1 // indirect
171174
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
172-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
175+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
173176
github.com/BurntSushi/toml v1.4.0 // indirect
174177
github.com/MakeNowJust/heredoc v1.0.0 // indirect
175178
github.com/PaesslerAG/gval v1.0.0 // indirect
@@ -304,16 +307,16 @@ require (
304307
go.opencensus.io v0.24.0 // indirect
305308
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
306309
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
307-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
308-
go.opentelemetry.io/otel v1.35.0 // indirect
309-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
310-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
310+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
311+
go.opentelemetry.io/otel v1.36.0 // indirect
312+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
313+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
311314
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
312315
go.uber.org/multierr v1.11.0 // indirect
313316
go.uber.org/zap v1.27.0 // indirect
314317
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
315-
golang.org/x/mod v0.24.0 // indirect
316-
golang.org/x/net v0.38.0 // indirect
318+
golang.org/x/mod v0.24.0
319+
golang.org/x/net v0.40.0 // indirect
317320
golang.org/x/time v0.9.0 // indirect
318321
golang.org/x/tools v0.31.0 // indirect
319322
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect

0 commit comments

Comments
 (0)