Skip to content

Commit ebd31b0

Browse files
Bump metal-operator and adapt latest MetalAPI Changes in HTTPBoot Controller (#289)
* 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](ironcore-dev/metal-operator@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] <support@github.com> * Adapt latest MetalAPI Changes in HTTPBoot Controller --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent a00bd0c commit ebd31b0

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/go-logr/logr v1.4.3
1010
github.com/ironcore-dev/controller-utils v0.11.0
1111
github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755
12-
github.com/ironcore-dev/metal-operator v0.3.0
12+
github.com/ironcore-dev/metal-operator v0.4.0
1313
github.com/onsi/ginkgo/v2 v2.28.1
1414
github.com/onsi/gomega v1.39.1
1515
github.com/opencontainers/go-digest v1.0.0
@@ -86,7 +86,7 @@ require (
8686
github.com/prometheus/procfs v0.19.1 // indirect
8787
github.com/sirupsen/logrus v1.9.3 // indirect
8888
github.com/spf13/pflag v1.0.10 // indirect
89-
github.com/stmcginnis/gofish v0.20.0 // indirect
89+
github.com/stmcginnis/gofish v0.21.4 // indirect
9090
github.com/stoewer/go-strcase v1.3.0 // indirect
9191
github.com/stretchr/testify v1.11.1 // indirect
9292
github.com/vincent-petithory/dataurl v1.0.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ github.com/ironcore-dev/controller-utils v0.11.0 h1:vQhZgPxxFwmSi+fSlPEuwCmI5sOP
141141
github.com/ironcore-dev/controller-utils v0.11.0/go.mod h1:kPIgIjGNMA5zUlwH04rCdDbYnvvDtd79z3Rgav1Yrpg=
142142
github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755 h1:EmR3Ngg2wmOXJkxgsdYVuPXLRfwWmO2Fi+htjih6QGY=
143143
github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755/go.mod h1:+/bmkghOE7acqXDT/LDH57RemaUzlVwnQjttsOjdoyg=
144-
github.com/ironcore-dev/metal-operator v0.3.0 h1:hHK4rmEH2ZHmZ3GYI8U0D6zbdE627AFp1hyEDwnLLuw=
145-
github.com/ironcore-dev/metal-operator v0.3.0/go.mod h1:9zPEgLN9bn379RfZmaR2nvxOSLM1sBuhVCUE36uZjNw=
144+
github.com/ironcore-dev/metal-operator v0.4.0 h1:D/5+eFe2n1Ro81ysWWv+RnyAHtB8pjrQMJzp8FhiYH8=
145+
github.com/ironcore-dev/metal-operator v0.4.0/go.mod h1:n7TDdJYvW1/4fqSjW5+uX5WRP671wGKyVELcTd8KWto=
146146
github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
147147
github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
148148
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
204204
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
205205
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
206206
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
207-
github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08=
208-
github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
207+
github.com/stmcginnis/gofish v0.21.4 h1:daexK8sh31CgeSMkPUNs21HWHHA9ecCPJPyLCTxukCg=
208+
github.com/stmcginnis/gofish v0.21.4/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
209209
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
210210
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
211211
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

internal/controller/serverbootconfiguration_http_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (r *ServerBootConfigurationHTTPReconciler) getSystemUUIDFromServer(ctx cont
173173
if err := r.Get(ctx, client.ObjectKey{Name: config.Spec.ServerRef.Name}, server); err != nil {
174174
return "", fmt.Errorf("failed to get Server: %w", err)
175175
}
176-
return server.Spec.UUID, nil
176+
return server.Spec.SystemUUID, nil
177177
}
178178

179179
// getSystemNetworkIDsFromServer fetches the IPs and MAC addresses from the network interfaces of the referenced Server object.

internal/controller/serverbootconfiguration_http_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
3838
GenerateName: "server-",
3939
},
4040
Spec: metalv1alpha1.ServerSpec{
41-
UUID: "12345",
41+
SystemUUID: "12345",
4242
},
4343
}
4444
Expect(k8sClient.Create(ctx, server)).To(Succeed())
@@ -87,7 +87,7 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
8787
Controller: ptr.To(true),
8888
BlockOwnerDeletion: ptr.To(true),
8989
})),
90-
HaveField("Spec.SystemUUID", server.Spec.UUID),
90+
HaveField("Spec.SystemUUID", server.Spec.SystemUUID),
9191
HaveField("Spec.NetworkIdentifiers", ContainElement("1.1.1.1")),
9292
HaveField("Spec.IgnitionSecretRef.Name", "foo"),
9393
))

0 commit comments

Comments
 (0)