ServerBootConfig Conditions Populations from Internal APIs

Author: hardikdr

.gitignore

@@ -5,6 +5,7 @@
 *.dll
 *.so
 *.dylib
+.DS_Store
 bin/*
 Dockerfile.cross
 

Makefile

@@ -192,6 +192,7 @@ ADDLICENSE ?= $(LOCALBIN)/addlicense
 GOIMPORTS ?= $(LOCALBIN)/goimports
 GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs
 KUBEBUILDER ?= $(LOCALBIN)/kubebuilder
+SETUP_ENVTEST_VERSION ?= v0.17.1   # example pre-0.22
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.5.0

api/v1alpha1/zz_generated.deepcopy.go

@@ -1,14 +1,14 @@
 module github.com/ironcore-dev/boot-operator
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/containerd/containerd v1.7.28
 	github.com/coreos/butane v0.25.1
 	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.1.0
+	github.com/ironcore-dev/metal-operator v0.1.1-0.20251106073609-33d5f16e0db1
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/opencontainers/image-spec v1.1.1

go.mod

@@ -140,8 +140,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.1.0 h1:0GqpKgfH5hG5jULUESsTr1dUH73ip3YJYIqtV8kBqoY=
-github.com/ironcore-dev/metal-operator v0.1.0/go.mod h1:JMxYoN5PJ0jvKhWlpV6kR9fhBXdLy2NNtvzJXXN/Iuc=
+github.com/ironcore-dev/metal-operator v0.1.1-0.20251106073609-33d5f16e0db1 h1:29bxRPvWNYGfMvAD06uS+bmfFndsAiCNtYbErEdOACc=
+github.com/ironcore-dev/metal-operator v0.1.1-0.20251106073609-33d5f16e0db1/go.mod h1:v6j2+CC/3iyRmXUp7JzyGpp/2EGDTEIQGYhlcegD+as=
 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=

go.sum

@@ -9,6 +9,8 @@ import (
 	"fmt"
 	"strings"
 
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+
 	"github.com/containerd/containerd/remotes/docker"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
@@ -133,15 +135,26 @@ func (r *ServerBootConfigurationHTTPReconciler) reconcile(ctx context.Context, l
 	return ctrl.Result{}, nil
 }
 
-func (r *ServerBootConfigurationHTTPReconciler) patchConfigStateFromHTTPState(ctx context.Context, httpBootConfig *bootv1alpha1.HTTPBootConfig, config *metalv1alpha1.ServerBootConfiguration) error {
-	if httpBootConfig.Status.State == bootv1alpha1.HTTPBootConfigStateReady {
-		return r.patchState(ctx, config, metalv1alpha1.ServerBootConfigurationStateReady)
+func (r *ServerBootConfigurationHTTPReconciler) patchConfigStateFromHTTPState(ctx context.Context, httpBootConfig *bootv1alpha1.HTTPBootConfig, cfg *metalv1alpha1.ServerBootConfiguration) error {
+	key := types.NamespacedName{Name: cfg.Name, Namespace: cfg.Namespace}
+	var cur metalv1alpha1.ServerBootConfiguration
+	if err := r.Client.Get(ctx, key, &cur); err != nil {
+		return err
 	}
+	base := cur.DeepCopy()
 
-	if httpBootConfig.Status.State == bootv1alpha1.HTTPBootConfigStateError {
-		return r.patchState(ctx, config, metalv1alpha1.ServerBootConfigurationStateError)
+	switch httpBootConfig.Status.State {
+	case bootv1alpha1.HTTPBootConfigStateReady:
+		cur.Status.State = metalv1alpha1.ServerBootConfigurationStateReady
+	case bootv1alpha1.HTTPBootConfigStateError:
+		cur.Status.State = metalv1alpha1.ServerBootConfigurationStateError
 	}
-	return nil
+
+	for _, c := range httpBootConfig.Status.Conditions {
+		apimeta.SetStatusCondition(&cur.Status.Conditions, c)
+	}
+
+	return r.Client.Status().Patch(ctx, &cur, client.MergeFrom(base))
 }
 
 func (r *ServerBootConfigurationHTTPReconciler) patchState(ctx context.Context, config *metalv1alpha1.ServerBootConfiguration, state metalv1alpha1.ServerBootConfigurationState) error {

go.work.sum

@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/ironcore-dev/boot-operator/api/v1alpha1"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -159,15 +160,26 @@ func (r *ServerBootConfigurationPXEReconciler) reconcile(ctx context.Context, lo
 	return ctrl.Result{}, nil
 }
 
-func (r *ServerBootConfigurationPXEReconciler) patchConfigStateFromIPXEState(ctx context.Context, ipxeConfig *v1alpha1.IPXEBootConfig, config *metalv1alpha1.ServerBootConfiguration) error {
-	if ipxeConfig.Status.State == v1alpha1.IPXEBootConfigStateReady {
-		return r.patchState(ctx, config, metalv1alpha1.ServerBootConfigurationStateReady)
+func (r *ServerBootConfigurationPXEReconciler) patchConfigStateFromIPXEState(ctx context.Context, ipxeConfig *v1alpha1.IPXEBootConfig, cfg *metalv1alpha1.ServerBootConfiguration) error {
+	key := types.NamespacedName{Name: cfg.Name, Namespace: cfg.Namespace}
+	var cur metalv1alpha1.ServerBootConfiguration
+	if err := r.Client.Get(ctx, key, &cur); err != nil {
+		return err
 	}
+	base := cur.DeepCopy()
 
-	if ipxeConfig.Status.State == v1alpha1.IPXEBootConfigStateError {
-		return r.patchState(ctx, config, metalv1alpha1.ServerBootConfigurationStateError)
+	switch ipxeConfig.Status.State {
+	case v1alpha1.IPXEBootConfigStateReady:
+		cur.Status.State = metalv1alpha1.ServerBootConfigurationStateReady
+	case v1alpha1.IPXEBootConfigStateError:
+		cur.Status.State = metalv1alpha1.ServerBootConfigurationStateError
 	}
-	return nil
+
+	for _, c := range ipxeConfig.Status.Conditions {
+		apimeta.SetStatusCondition(&cur.Status.Conditions, c)
+	}
+
+	return r.Client.Status().Patch(ctx, &cur, client.MergeFrom(base))
 }
 
 func (r *ServerBootConfigurationPXEReconciler) patchState(ctx context.Context, config *metalv1alpha1.ServerBootConfiguration, state metalv1alpha1.ServerBootConfigurationState) error {

internal/controller/serverbootconfiguration_http_controller.go

@@ -152,4 +152,78 @@ var _ = Describe("ServerBootConfiguration Controller", func() {
 			HaveField("Spec.IgnitionSecretRef.Name", "foo"),
 		))
 	})
+
+	It("should mirror IPXEScriptFetched condition onto ServerBootConfiguration", func(ctx SpecContext) {
+		By("creating a new Server object")
+		server := &metalv1alpha1.Server{
+			ObjectMeta: metav1.ObjectMeta{
+				GenerateName: "server-",
+			},
+			Spec: metalv1alpha1.ServerSpec{
+				UUID: "12345",
+			},
+		}
+		Expect(k8sClient.Create(ctx, server)).To(Succeed())
+
+		By("patching the Server NICs in Server status")
+		Eventually(UpdateStatus(server, func() {
+			server.Status.NetworkInterfaces = []metalv1alpha1.NetworkInterface{
+				{
+					Name:       "foo",
+					IP:         metalv1alpha1.MustParseIP("1.1.1.1"),
+					MACAddress: "abcd",
+				},
+			}
+		})).Should(Succeed())
+
+		By("creating a new ServerBootConfiguration")
+		cfg := &metalv1alpha1.ServerBootConfiguration{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:    ns.Name,
+				GenerateName: "test-",
+			},
+			Spec: metalv1alpha1.ServerBootConfigurationSpec{
+				ServerRef: corev1.LocalObjectReference{
+					Name: server.Name,
+				},
+				Image:             "ghcr.io/ironcore-dev/os-images/gardenlinux:1877.0",
+				IgnitionSecretRef: &corev1.LocalObjectReference{Name: "foo"},
+			},
+		}
+		Expect(k8sClient.Create(ctx, cfg)).To(Succeed())
+
+		By("waiting for the IPXEBootConfig to be created")
+		ipxe := &v1alpha1.IPXEBootConfig{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: ns.Name,
+				Name:      cfg.Name,
+			},
+		}
+		Eventually(Object(ipxe)).Should(Succeed())
+
+		By("setting IPXEScriptFetched=True on the IPXEBootConfig status")
+		Eventually(UpdateStatus(ipxe, func() {
+			ipxe.Status.State = v1alpha1.IPXEBootConfigStateReady
+			ipxe.Status.Conditions = []metav1.Condition{
+				{
+					Type:    "IPXEScriptFetched",
+					Status:  metav1.ConditionTrue,
+					Reason:  "ScriptDelivered",
+					Message: "iPXE script has been successfully delivered to the client.",
+				},
+			}
+		})).Should(Succeed())
+
+		By("verifying the condition appears on the ServerBootConfiguration status")
+		Eventually(Object(cfg)).Should(SatisfyAll(
+			WithTransform(func(c *metalv1alpha1.ServerBootConfiguration) bool {
+				for _, cond := range c.Status.Conditions {
+					if cond.Type == "IPXEScriptFetched" && cond.Status == metav1.ConditionTrue {
+						return true
+					}
+				}
+				return false
+			}, BeTrue()),
+		))
+	})
 })