Review comments

hardikdr · hardikdr · commit 0b4afa497da3 · 2026-04-02T13:05:31.000+02:00
diff --git a/api/v1alpha1/httpbootconfig_types.go b/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"`
 }
diff --git a/api/v1alpha1/ipxebootconfig_types.go b/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"`
 }
diff --git a/config/crd/bases/boot.ironcore.dev_httpbootconfigs.yaml b/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
diff --git a/config/crd/bases/boot.ironcore.dev_ipxebootconfigs.yaml b/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'
diff --git a/dist/chart/templates/crd/boot.ironcore.dev_httpbootconfigs.yaml b/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
diff --git a/dist/chart/templates/crd/boot.ironcore.dev_ipxebootconfigs.yaml b/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'
diff --git a/docs/api-reference/api.md b/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 |  |  |
 
 
diff --git a/internal/controller/httpbootconfig_controller.go b/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
diff --git a/internal/controller/ipxebootconfig_controller.go b/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)
diff --git a/internal/controller/serverbootconfiguration_http_controller.go b/internal/controller/serverbootconfiguration_http_controller.go
@@ -165,12 +165,16 @@ func (r *ServerBootConfigurationHTTPReconciler) patchHTTPBootReadyConditionFromH
 			Type:               HTTPBootReadyConditionType,
 			ObservedGeneration: cur.Generation,
 		}
-		switch httpBootConfig.Status.State {
-		case bootv1alpha1.HTTPBootConfigStateReady:
+		switch {
+		case httpBootConfig.Status.ObservedGeneration < httpBootConfig.Generation:
+			cond.Status = metav1.ConditionUnknown
+			cond.Reason = "BootConfigPending"
+			cond.Message = "Waiting for HTTPBootConfig to reconcile the new spec."
+		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."
diff --git a/internal/controller/serverbootconfiguration_pxe_controller.go b/internal/controller/serverbootconfiguration_pxe_controller.go
@@ -184,12 +184,16 @@ func (r *ServerBootConfigurationPXEReconciler) patchIPXEBootReadyConditionFromIP
 			Type:               IPXEBootReadyConditionType,
 			ObservedGeneration: cur.Generation,
 		}
-		switch config.Status.State {
-		case v1alpha1.IPXEBootConfigStateReady:
+		switch {
+		case config.Status.ObservedGeneration < config.Generation:
+			cond.Status = metav1.ConditionUnknown
+			cond.Reason = "BootConfigPending"
+			cond.Message = "Waiting for IPXEBootConfig to reconcile the new spec."
+		case config.Status.State == v1alpha1.IPXEBootConfigStateReady:
 			cond.Status = metav1.ConditionTrue
 			cond.Reason = "BootConfigReady"
 			cond.Message = "IPXE boot configuration is ready."
-		case v1alpha1.IPXEBootConfigStateError:
+		case config.Status.State == v1alpha1.IPXEBootConfigStateError:
 			cond.Status = metav1.ConditionFalse
 			cond.Reason = "BootConfigError"
 			cond.Message = "IPXEBootConfig reported an error."

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ type HTTPBootConfigSpec struct {`
`27`	`27`	`type HTTPBootConfigStatus struct {`
`28`	`28`	State HTTPBootConfigState `json:"state,omitempty"`
`29`	`29`
	`30`	`+ // ObservedGeneration is the generation of the HTTPBootConfig that was last reconciled by the controller.`
	`31`	+ ObservedGeneration int64 `json:"observedGeneration,omitempty"`
	`32`	`+`
`30`	`33`	`// Conditions represent the latest available observations of the IPXEBootConfig's state`
`31`	`34`	Conditions []metav1.Condition `json:"conditions,omitempty"`
`32`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ type IPXEBootConfigStatus struct {`
`59`	`59`	`// Important: Run "make" to regenerate code after modifying this file`
`60`	`60`	State IPXEBootConfigState `json:"state,omitempty"`
`61`	`61`
	`62`	`+ // ObservedGeneration is the generation of the IPXEBootConfig that was last reconciled by the controller.`
	`63`	+ ObservedGeneration int64 `json:"observedGeneration,omitempty"`
	`64`	`+`
`62`	`65`	`// Conditions represent the latest available observations of the IPXEBootConfig's state`
`63`	`66`	Conditions []metav1.Condition `json:"conditions,omitempty"`
`64`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,13 @@ func (r *HTTPBootConfigReconciler) delete(_ context.Context, log logr.Logger, _`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`func (r HTTPBootConfigReconciler) patchStatus(ctx context.Context, config bootv1alpha1.HTTPBootConfig, state bootv1alpha1.HTTPBootConfigState) error {`
`98`		`- if config.Status.State == state {`
	`98`	`+ if config.Status.State == state && config.Status.ObservedGeneration == config.Generation {`
`99`	`99`	`return nil`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`base := config.DeepCopy()`
`103`	`103`	`config.Status.State = state`
	`104`	`+ config.Status.ObservedGeneration = config.Generation`
`104`	`105`
`105`	`106`	`if err := r.Status().Patch(ctx, config, client.MergeFrom(base)); err != nil {`
`106`	`107`	`return err`