Skip to content

Commit

Permalink
Apply BMC labels to Server on creation (#222)
Browse files Browse the repository at this point in the history
* Merge `BMC` labels to `Server`

* use metautils instead
  • Loading branch information
defo89 authored Jan 24, 2025
1 parent 2e6a070 commit d554069
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions internal/controller/bmc_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/go-logr/logr"
"github.com/ironcore-dev/controller-utils/clientutils"
"github.com/ironcore-dev/controller-utils/metautils"
metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1"
"github.com/ironcore-dev/metal-operator/bmc"
"github.com/ironcore-dev/metal-operator/internal/bmcutils"
Expand Down Expand Up @@ -164,6 +165,7 @@ func (r *BMCReconciler) discoverServers(ctx context.Context, log logr.Logger, bm
server.Name = bmcutils.GetServerNameFromBMCandIndex(i, bmcObj)

opResult, err := controllerutil.CreateOrPatch(ctx, r.Client, server, func() error {
metautils.SetLabels(server, bmcObj.Labels)
server.Spec.UUID = strings.ToLower(s.UUID)
server.Spec.SystemUUID = strings.ToLower(s.UUID)
server.Spec.BMCRef = &v1.LocalObjectReference{Name: bmcObj.Name}
Expand Down
6 changes: 6 additions & 0 deletions internal/controller/bmc_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,15 @@ var _ = Describe("BMC Controller", func() {
Expect(k8sClient.Create(ctx, bmcSecret)).To(Succeed())
DeferCleanup(k8sClient.Delete, bmcSecret)

bmcLabels := map[string]string{
"foo": "bar",
}

By("Creating a BMC resource")
bmc := &metalv1alpha1.BMC{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-",
Labels: bmcLabels,
},
Spec: metalv1alpha1.BMCSpec{
Endpoint: &metalv1alpha1.InlineEndpoint{
Expand Down Expand Up @@ -151,6 +156,7 @@ var _ = Describe("BMC Controller", func() {
Controller: ptr.To(true),
BlockOwnerDeletion: ptr.To(true),
})),
HaveField("ObjectMeta.Labels", bmcLabels),
HaveField("Spec.UUID", "38947555-7742-3448-3784-823347823834"),
HaveField("Spec.SystemUUID", "38947555-7742-3448-3784-823347823834"),
HaveField("Spec.BMCRef.Name", bmc.Name),
Expand Down

0 comments on commit d554069

Please sign in to comment.