From 2864662c2835faa7f7809b44ff451e0f17e89ae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2026 09:39:05 +0000 Subject: [PATCH 1/2] Bump github.com/ironcore-dev/metal-operator from 0.3.0 to 0.4.0 Bumps [github.com/ironcore-dev/metal-operator](https://github.com/ironcore-dev/metal-operator) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/ironcore-dev/metal-operator/releases) - [Commits](https://github.com/ironcore-dev/metal-operator/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: github.com/ironcore-dev/metal-operator dependency-version: 0.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 15c4b69..da2a68c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-logr/logr v1.4.3 github.com/ironcore-dev/controller-utils v0.11.0 github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755 - github.com/ironcore-dev/metal-operator v0.3.0 + github.com/ironcore-dev/metal-operator v0.4.0 github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 github.com/opencontainers/go-digest v1.0.0 @@ -86,7 +86,7 @@ require ( github.com/prometheus/procfs v0.19.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.10 // indirect - github.com/stmcginnis/gofish v0.20.0 // indirect + github.com/stmcginnis/gofish v0.21.4 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect github.com/stretchr/testify v1.11.1 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect diff --git a/go.sum b/go.sum index 7248593..836a694 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/ironcore-dev/controller-utils v0.11.0 h1:vQhZgPxxFwmSi+fSlPEuwCmI5sOP github.com/ironcore-dev/controller-utils v0.11.0/go.mod h1:kPIgIjGNMA5zUlwH04rCdDbYnvvDtd79z3Rgav1Yrpg= github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755 h1:EmR3Ngg2wmOXJkxgsdYVuPXLRfwWmO2Fi+htjih6QGY= github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755/go.mod h1:+/bmkghOE7acqXDT/LDH57RemaUzlVwnQjttsOjdoyg= -github.com/ironcore-dev/metal-operator v0.3.0 h1:hHK4rmEH2ZHmZ3GYI8U0D6zbdE627AFp1hyEDwnLLuw= -github.com/ironcore-dev/metal-operator v0.3.0/go.mod h1:9zPEgLN9bn379RfZmaR2nvxOSLM1sBuhVCUE36uZjNw= +github.com/ironcore-dev/metal-operator v0.4.0 h1:D/5+eFe2n1Ro81ysWWv+RnyAHtB8pjrQMJzp8FhiYH8= +github.com/ironcore-dev/metal-operator v0.4.0/go.mod h1:n7TDdJYvW1/4fqSjW5+uX5WRP671wGKyVELcTd8KWto= github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE= github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -204,8 +204,8 @@ github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiT github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08= -github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU= +github.com/stmcginnis/gofish v0.21.4 h1:daexK8sh31CgeSMkPUNs21HWHHA9ecCPJPyLCTxukCg= +github.com/stmcginnis/gofish v0.21.4/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU= github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 6940e8db3c2b9b705603a81477c3446906d60126 Mon Sep 17 00:00:00 2001 From: Hardik Dodiya Date: Thu, 19 Mar 2026 11:28:05 +0100 Subject: [PATCH 2/2] Adapt latest MetalAPI Changes in HTTPBoot Controller --- .../controller/serverbootconfiguration_http_controller.go | 2 +- .../serverbootconfiguration_http_controller_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controller/serverbootconfiguration_http_controller.go b/internal/controller/serverbootconfiguration_http_controller.go index 7f80112..2501dba 100644 --- a/internal/controller/serverbootconfiguration_http_controller.go +++ b/internal/controller/serverbootconfiguration_http_controller.go @@ -173,7 +173,7 @@ func (r *ServerBootConfigurationHTTPReconciler) getSystemUUIDFromServer(ctx cont if err := r.Get(ctx, client.ObjectKey{Name: config.Spec.ServerRef.Name}, server); err != nil { return "", fmt.Errorf("failed to get Server: %w", err) } - return server.Spec.UUID, nil + return server.Spec.SystemUUID, nil } // getSystemNetworkIDsFromServer fetches the IPs and MAC addresses from the network interfaces of the referenced Server object. diff --git a/internal/controller/serverbootconfiguration_http_controller_test.go b/internal/controller/serverbootconfiguration_http_controller_test.go index 6404902..5b66e3e 100644 --- a/internal/controller/serverbootconfiguration_http_controller_test.go +++ b/internal/controller/serverbootconfiguration_http_controller_test.go @@ -38,7 +38,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() { GenerateName: "server-", }, Spec: metalv1alpha1.ServerSpec{ - UUID: "12345", + SystemUUID: "12345", }, } Expect(k8sClient.Create(ctx, server)).To(Succeed()) @@ -87,7 +87,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() { Controller: ptr.To(true), BlockOwnerDeletion: ptr.To(true), })), - HaveField("Spec.SystemUUID", server.Spec.UUID), + HaveField("Spec.SystemUUID", server.Spec.SystemUUID), HaveField("Spec.NetworkIdentifiers", ContainElement("1.1.1.1")), HaveField("Spec.IgnitionSecretRef.Name", "foo"), ))