Review comments

Author: hardikdr

api/v1alpha1/httpbootconfig_types.go

@@ -27,6 +27,9 @@ type HTTPBootConfigSpec struct {
 type HTTPBootConfigStatus struct {
 	State HTTPBootConfigState `json:"state,omitempty"`
 
+	// ObservedGeneration is the generation of the HTTPBootConfig that was last reconciled by the controller.
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
 	// Conditions represent the latest available observations of the IPXEBootConfig's state
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

api/v1alpha1/ipxebootconfig_types.go

@@ -59,6 +59,9 @@ type IPXEBootConfigStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 	State IPXEBootConfigState `json:"state,omitempty"`
 
+	// ObservedGeneration is the generation of the IPXEBootConfig that was last reconciled by the controller.
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
 	// Conditions represent the latest available observations of the IPXEBootConfig's state
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml

@@ -136,6 +136,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: ObservedGeneration is the generation of the HTTPBootConfig
+                  that was last reconciled by the controller.
+                format: int64
+                type: integer
               state:
                 type: string
             type: object

config/crd/bases/boot.ironcore.dev_ipxebootconfigs.yaml

@@ -165,6 +165,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: ObservedGeneration is the generation of the IPXEBootConfig
+                  that was last reconciled by the controller.
+                format: int64
+                type: integer
               state:
                 description: 'Important: Run "make" to regenerate code after modifying
                   this file'

dist/chart/templates/crd/boot.ironcore.dev_httpbootconfigs.yaml

@@ -142,6 +142,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: ObservedGeneration is the generation of the HTTPBootConfig
+                  that was last reconciled by the controller.
+                format: int64
+                type: integer
               state:
                 type: string
             type: object

dist/chart/templates/crd/boot.ironcore.dev_ipxebootconfigs.yaml

@@ -171,6 +171,11 @@ spec:
                   - type
                   type: object
                 type: array
+              observedGeneration:
+                description: ObservedGeneration is the generation of the IPXEBootConfig
+                  that was last reconciled by the controller.
+                format: int64
+                type: integer
               state:
                 description: 'Important: Run "make" to regenerate code after modifying
                   this file'

docs/api-reference/api.md

@@ -86,6 +86,7 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `state` _[HTTPBootConfigState](#httpbootconfigstate)_ |  |  |  |
+| `observedGeneration` _integer_ | ObservedGeneration is the generation of the HTTPBootConfig that was last reconciled by the controller. |  |  |
 | `conditions` _[Condition](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#condition-v1-meta) array_ | Conditions represent the latest available observations of the IPXEBootConfig's state |  |  |
 
 
@@ -164,6 +165,7 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `state` _[IPXEBootConfigState](#ipxebootconfigstate)_ | Important: Run "make" to regenerate code after modifying this file |  |  |
+| `observedGeneration` _integer_ | ObservedGeneration is the generation of the IPXEBootConfig that was last reconciled by the controller. |  |  |
 | `conditions` _[Condition](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#condition-v1-meta) array_ | Conditions represent the latest available observations of the IPXEBootConfig's state |  |  |
 
 

internal/controller/httpbootconfig_controller.go

@@ -95,12 +95,13 @@ func (r *HTTPBootConfigReconciler) delete(_ context.Context, log logr.Logger, _
 }
 
 func (r *HTTPBootConfigReconciler) patchStatus(ctx context.Context, config *bootv1alpha1.HTTPBootConfig, state bootv1alpha1.HTTPBootConfigState) error {
-	if config.Status.State == state {
+	if config.Status.State == state && config.Status.ObservedGeneration == config.Generation {
 		return nil
 	}
 
 	base := config.DeepCopy()
 	config.Status.State = state
+	config.Status.ObservedGeneration = config.Generation
 
 	if err := r.Status().Patch(ctx, config, client.MergeFrom(base)); err != nil {
 		return err

internal/controller/ipxebootconfig_controller.go

@@ -100,6 +100,7 @@ func (r *IPXEBootConfigReconciler) patchStatus(
 ) error {
 	base := ipxeBootConfig.DeepCopy()
 	ipxeBootConfig.Status.State = state
+	ipxeBootConfig.Status.ObservedGeneration = ipxeBootConfig.Generation
 
 	if err := r.Status().Patch(ctx, ipxeBootConfig, client.MergeFrom(base)); err != nil {
 		return fmt.Errorf("error patching ipxeBootConfig: %w", err)

internal/controller/serverbootconfiguration_http_controller.go

@@ -161,22 +161,34 @@ func (r *ServerBootConfigurationHTTPReconciler) patchHTTPBootReadyConditionFromH
 		}
 		base := cur.DeepCopy()
 
+		if cur.Generation != cfg.Generation {
+			// The SBC has been updated since this reconcile started; a newer reconcile
+			// will handle the fresh generation. Avoid stamping stale data on it.
+			return nil
+		}
+
 		cond := metav1.Condition{
-			Type:               HTTPBootReadyConditionType,
-			ObservedGeneration: cur.Generation,
+			Type: HTTPBootReadyConditionType,
+			// Use cfg.Generation, not cur.Generation: the condition content was
+			// derived from cfg's HTTPBootConfig, so it reflects that generation.
+			ObservedGeneration: cfg.Generation,
 		}
-		switch httpBootConfig.Status.State {
-		case bootv1alpha1.HTTPBootConfigStateReady:
+		switch {
+		case httpBootConfig.Status.ObservedGeneration < httpBootConfig.Generation:
+			// Child controller hasn't reconciled the new spec yet; don't write anything.
+			// The Owns() watch will re-trigger this reconcile once the child updates its status.
+			return nil
+		case httpBootConfig.Status.State == bootv1alpha1.HTTPBootConfigStateReady:
 			cond.Status = metav1.ConditionTrue
 			cond.Reason = "BootConfigReady"
 			cond.Message = "HTTP boot configuration is ready."
-		case bootv1alpha1.HTTPBootConfigStateError:
+		case httpBootConfig.Status.State == bootv1alpha1.HTTPBootConfigStateError:
 			cond.Status = metav1.ConditionFalse
 			cond.Reason = "BootConfigError"
 			cond.Message = "HTTPBootConfig reported an error."
 		default:
 			cond.Status = metav1.ConditionUnknown
-			cond.Reason = "BootConfigPending"
+			cond.Reason = BootConfigPendingReason
 			cond.Message = "Waiting for HTTPBootConfig to become Ready."
 		}