Skip to content

Added multi-arch image support #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukasfrank merged 1 commit into from
Oct 13, 2025
Merged

Added multi-arch image support #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions cmd/libvirt-provider/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
libvirtutils "github.com/ironcore-dev/libvirt-provider/internal/libvirt/utils"
"github.com/ironcore-dev/libvirt-provider/internal/mcr"
"github.com/ironcore-dev/libvirt-provider/internal/networkinterfaceplugin"
"github.com/ironcore-dev/libvirt-provider/internal/oci"
volumeplugin "github.com/ironcore-dev/libvirt-provider/internal/plugins/volume"
"github.com/ironcore-dev/libvirt-provider/internal/plugins/volume/ceph"
"github.com/ironcore-dev/libvirt-provider/internal/plugins/volume/emptydisk"
Expand All @@ -40,6 +39,8 @@ import (
"github.com/ironcore-dev/libvirt-provider/internal/strategy"
"github.com/ironcore-dev/provider-utils/eventutils/event"
"github.com/ironcore-dev/provider-utils/eventutils/recorder"
ocihostutils "github.com/ironcore-dev/provider-utils/ociutils/host"
ociutils "github.com/ironcore-dev/provider-utils/ociutils/oci"
hostutils "github.com/ironcore-dev/provider-utils/storeutils/host"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -220,7 +221,14 @@ func Run(ctx context.Context, opts Options) error {
return err
}

reg, err := remote.DockerRegistry(nil)
platform, err := ocihostutils.Platform()
if err != nil {
setupLog.Error(err, "failed to get host platform: %w", err)
return err
}
setupLog.Info("Current platform", "architecture", platform.Architecture)

reg, err := remote.DockerRegistryWithPlatform(nil, platform)
if err != nil {
setupLog.Error(err, "failed to initialize registry")
return err
Expand All @@ -232,7 +240,7 @@ func Run(ctx context.Context, opts Options) error {
return err
}

imgCache, err := oci.NewLocalCache(log, reg, ociStore)
imgCache, err := ociutils.NewLocalCache(log, reg, ociStore, nil)
if err != nil {
setupLog.Error(err, "failed to initialize oci manager")
return err
Expand Down
36 changes: 15 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,27 @@ toolchain go1.24.1

require (
github.com/blang/semver/v4 v4.0.0
github.com/containerd/containerd v1.7.28
github.com/digitalocean/go-libvirt v0.0.0-20250616175656-5843751af96c
github.com/go-chi/chi/v5 v5.2.3
github.com/go-logr/logr v1.4.3
github.com/google/uuid v1.6.0
github.com/ironcore-dev/controller-utils v0.10.0
github.com/ironcore-dev/ironcore v0.2.4-0.20250704085741-9036bfe3b718
github.com/ironcore-dev/ironcore-image v0.2.4
github.com/ironcore-dev/ironcore v0.2.4
github.com/ironcore-dev/ironcore-image v0.2.5
github.com/ironcore-dev/ironcore-net v0.2.3
github.com/ironcore-dev/provider-utils v0.0.0-20250829073857-ee02a09dd769
github.com/ironcore-dev/provider-utils v0.0.0-20251010114402-394db8015df4
github.com/moby/term v0.5.2
github.com/onsi/ginkgo/v2 v2.25.3
github.com/onsi/ginkgo/v2 v2.26.0
github.com/onsi/gomega v1.38.2
github.com/opencontainers/image-spec v1.1.1
github.com/prometheus/client_golang v1.23.2
github.com/shirou/gopsutil/v3 v3.24.5
github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.10
golang.org/x/sync v0.17.0
google.golang.org/grpc v1.75.1
k8s.io/api v0.33.3
k8s.io/apimachinery v0.33.3
k8s.io/client-go v0.33.3
k8s.io/api v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4
k8s.io/kubectl v0.33.3
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
libvirt.org/go/libvirtxml v1.11007.0
Expand All @@ -39,24 +37,21 @@ require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/Microsoft/hcsshim v0.13.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/cgroups/v3 v3.0.5 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/containerd v1.7.28 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v28.0.1+incompatible // indirect
github.com/docker/cli v28.0.4+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v28.0.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.2 // indirect
github.com/docker/docker v28.0.4+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
Expand All @@ -71,7 +66,6 @@ require (
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
Expand All @@ -88,12 +82,12 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
Expand All @@ -116,6 +110,7 @@ require (
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.35.0 // indirect
Expand All @@ -129,7 +124,6 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apiserver v0.33.3 // indirect
k8s.io/cli-runtime v0.33.3 // indirect
Expand All @@ -139,5 +133,5 @@ require (
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.5.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading