Skip to content

Commit b29e956

Browse files
hardikdrdefo89
hardikdr
and
defo89
authored
Support OCI Spec Published under Ironcore (#173)
* Adapt to the new OCI spec published under Ironcore Image * Update server/imageproxyserver.go Co-authored-by: Dmitri Fedotov <[email protected]> --------- Co-authored-by: Dmitri Fedotov <[email protected]>
1 parent dbcedda commit b29e956

File tree

8 files changed

+328
-154
lines changed

8 files changed

+328
-154
lines changed

‎cmd/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ func main() {
254254
Client: mgr.GetClient(),
255255
Scheme: mgr.GetScheme(),
256256
ImageServerURL: imageServerURL,
257+
Architecture: architecture,
257258
}).SetupWithManager(mgr); err != nil {
258259
setupLog.Error(err, "unable to create controller", "controller", "ServerBootConfigHttp")
259260
os.Exit(1)

‎go.mod‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,25 @@ go 1.24.0
55
require (
66
github.com/containerd/containerd v1.7.27
77
github.com/coreos/butane v0.23.0
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
99
github.com/ironcore-dev/controller-utils v0.9.9
1010
github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755
11-
github.com/ironcore-dev/metal-operator v0.0.0-20250131095910-06a17dd3b94c
11+
github.com/ironcore-dev/metal-operator v0.0.0-20250610133926-d98b2dc3490d
1212
github.com/onsi/ginkgo/v2 v2.23.4
1313
github.com/onsi/gomega v1.37.0
1414
github.com/opencontainers/image-spec v1.1.1
1515
github.com/spf13/cobra v1.9.1
16-
k8s.io/api v0.33.0
17-
k8s.io/apimachinery v0.33.0
18-
k8s.io/client-go v0.33.0
19-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
20-
sigs.k8s.io/controller-runtime v0.20.4
16+
k8s.io/api v0.33.1
17+
k8s.io/apimachinery v0.33.1
18+
k8s.io/client-go v0.33.1
19+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
20+
sigs.k8s.io/controller-runtime v0.21.0
2121
)
2222

2323
require (
24-
cel.dev/expr v0.18.0 // indirect
24+
cel.dev/expr v0.19.3 // indirect
2525
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
26-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
27-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
26+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2827
github.com/aws/aws-sdk-go v1.55.5 // indirect
2928
github.com/beorn7/perks v1.0.1 // indirect
3029
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -44,78 +43,80 @@ require (
4443
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4544
github.com/felixge/httpsnoop v1.0.4 // indirect
4645
github.com/fsnotify/fsnotify v1.7.0 // indirect
47-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
46+
github.com/fxamacker/cbor/v2 v2.7.1 // indirect
4847
github.com/go-logr/stdr v1.2.2 // indirect
4948
github.com/go-logr/zapr v1.3.0 // indirect
50-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
49+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5150
github.com/go-openapi/jsonreference v0.21.0 // indirect
52-
github.com/go-openapi/swag v0.23.0 // indirect
51+
github.com/go-openapi/swag v0.23.1 // indirect
5352
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5453
github.com/gogo/protobuf v1.3.2 // indirect
5554
github.com/google/btree v1.1.3 // indirect
56-
github.com/google/cel-go v0.22.0 // indirect
55+
github.com/google/cel-go v0.23.2 // indirect
5756
github.com/google/gnostic-models v0.6.9 // indirect
5857
github.com/google/go-cmp v0.7.0 // indirect
59-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
58+
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
6059
github.com/google/uuid v1.6.0 // indirect
61-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
60+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
6261
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6362
github.com/josharian/intern v1.0.0 // indirect
6463
github.com/json-iterator/go v1.1.12 // indirect
65-
github.com/klauspost/compress v1.16.7 // indirect
66-
github.com/mailru/easyjson v0.7.7 // indirect
64+
github.com/klauspost/compress v1.18.0 // indirect
65+
github.com/mailru/easyjson v0.9.0 // indirect
6766
github.com/moby/locker v1.0.1 // indirect
6867
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6968
github.com/modern-go/reflect2 v1.0.2 // indirect
7069
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7170
github.com/opencontainers/go-digest v1.0.0 // indirect
7271
github.com/pkg/errors v0.9.1 // indirect
7372
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
74-
github.com/prometheus/client_golang v1.19.1 // indirect
75-
github.com/prometheus/client_model v0.6.1 // indirect
76-
github.com/prometheus/common v0.55.0 // indirect
73+
github.com/prometheus/client_golang v1.22.0 // indirect
74+
github.com/prometheus/client_model v0.6.2 // indirect
75+
github.com/prometheus/common v0.62.0 // indirect
7776
github.com/prometheus/procfs v0.15.1 // indirect
7877
github.com/sirupsen/logrus v1.9.3 // indirect
7978
github.com/spf13/pflag v1.0.6 // indirect
79+
github.com/stmcginnis/gofish v0.20.0 // indirect
8080
github.com/stoewer/go-strcase v1.3.0 // indirect
8181
github.com/stretchr/testify v1.10.0 // indirect
8282
github.com/vincent-petithory/dataurl v1.0.0 // indirect
8383
github.com/x448/float16 v0.8.4 // indirect
84-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
85-
go.opentelemetry.io/otel v1.28.0 // indirect
86-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
88-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
89-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
91-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
84+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
85+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
86+
go.opentelemetry.io/otel v1.34.0 // indirect
87+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
88+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
89+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
90+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
91+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
92+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
9293
go.uber.org/automaxprocs v1.6.0 // indirect
9394
go.uber.org/multierr v1.11.0 // indirect
9495
go.uber.org/zap v1.27.0 // indirect
95-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
96-
golang.org/x/net v0.38.0 // indirect
96+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
97+
golang.org/x/net v0.40.0 // indirect
9798
golang.org/x/oauth2 v0.27.0 // indirect
98-
golang.org/x/sync v0.12.0 // indirect
99-
golang.org/x/sys v0.32.0 // indirect
100-
golang.org/x/term v0.30.0 // indirect
101-
golang.org/x/text v0.23.0 // indirect
99+
golang.org/x/sync v0.14.0 // indirect
100+
golang.org/x/sys v0.33.0 // indirect
101+
golang.org/x/term v0.32.0 // indirect
102+
golang.org/x/text v0.25.0 // indirect
102103
golang.org/x/time v0.9.0 // indirect
103-
golang.org/x/tools v0.31.0 // indirect
104+
golang.org/x/tools v0.33.0 // indirect
104105
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
107-
google.golang.org/grpc v1.65.0 // indirect
108-
google.golang.org/protobuf v1.36.5 // indirect
106+
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
107+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
108+
google.golang.org/grpc v1.71.3 // indirect
109+
google.golang.org/protobuf v1.36.6 // indirect
109110
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
110111
gopkg.in/inf.v0 v0.9.1 // indirect
111112
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/apiextensions-apiserver v0.32.3 // indirect
113-
k8s.io/apiserver v0.32.3 // indirect
114-
k8s.io/component-base v0.32.3 // indirect
113+
k8s.io/apiextensions-apiserver v0.33.1 // indirect
114+
k8s.io/apiserver v0.33.1 // indirect
115+
k8s.io/component-base v0.33.1 // indirect
115116
k8s.io/klog/v2 v2.130.1 // indirect
116117
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
117-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
118-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
118+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.3 // indirect
119+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
119120
sigs.k8s.io/randfill v1.0.0 // indirect
120121
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
121122
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)