Fix job.bmc creation and deletion:

Use status' to make sure creation and deletion work properly. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Sep 19, 2024 · b3b089f · b3b089f
1 parent 4ebc9e5
commit b3b089f
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 128 deletions.
diff --git a/api/v1alpha1/workflow_types.go b/api/v1alpha1/workflow_types.go
@@ -13,6 +13,8 @@ const (
 	WorkflowStateTimeout   = WorkflowState("STATE_TIMEOUT")
 	WorkflowStateSuccess   = WorkflowState("STATE_SUCCESS")
 	WorkflowStatePreparing = WorkflowState("STATE_PREPARING")
+	StatusSuccess          = "success"
+	StatusFailure          = "failure"
 )
 
 // WorkflowSpec defines the desired state of Workflow.
@@ -64,7 +66,12 @@ type WorkflowStatus struct {
 	ToggleHardware *Status `json:"toggleHardware,omitempty"`
 
 	// OneTimeNetboot indicates whether the controller has successfully netbooted the associated hardware.
-	OneTimeNetboot *Status `json:"oneTimeNetboot,omitempty"`
+	OneTimeNetboot OneTimeNetbootStatus `json:"oneTimeNetboot,omitempty"`
+}
+
+type OneTimeNetbootStatus struct {
+	CreationStatus *Status `json:"creationStatus,omitempty"`
+	DeletionStatus *Status `json:"deletionStatus,omitempty"`
 }
 
 // Wanted to use metav1.Status but kubebuilder errors with, "must apply listType to an array, found".
@@ -92,6 +99,13 @@ type Status struct {
 	// Details *metav1.StatusDetails `json:"details,omitempty" protobuf:"bytes,5,opt,name=details"`
 }
 
+func (s *Status) IsSuccess() bool {
+	if s == nil {
+		return false
+	}
+	return s.Status == StatusSuccess
+}
+
 // Task represents a series of actions to be completed by a worker.
 type Task struct {
 	Name        string            `json:"name"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/tinkerbell.org_workflows.yaml b/config/crd/bases/tinkerbell.org_workflows.yaml
@@ -87,22 +87,46 @@ spec:
                 oneTimeNetboot:
                   description: OneTimeNetboot indicates whether the controller has successfully netbooted the associated hardware.
                   properties:
-                    message:
-                      description: A human-readable description of the status of this operation.
-                      type: string
-                    reason:
-                      description: |-
-                        A machine-readable description of why this operation is in the
-                        "Failure" status. If this value is empty there
-                        is no information available. A Reason clarifies an HTTP status
-                        code but does not override it.
-                      type: string
-                    status:
-                      description: |-
-                        Status of the operation.
-                        One of: "Success" or "Failure".
-                        More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
-                      type: string
+                    creationStatus:
+                      description: Wanted to use metav1.Status but kubebuilder errors with, "must apply listType to an array, found".
+                      properties:
+                        message:
+                          description: A human-readable description of the status of this operation.
+                          type: string
+                        reason:
+                          description: |-
+                            A machine-readable description of why this operation is in the
+                            "Failure" status. If this value is empty there
+                            is no information available. A Reason clarifies an HTTP status
+                            code but does not override it.
+                          type: string
+                        status:
+                          description: |-
+                            Status of the operation.
+                            One of: "Success" or "Failure".
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+                          type: string
+                      type: object
+                    deletionStatus:
+                      description: Wanted to use metav1.Status but kubebuilder errors with, "must apply listType to an array, found".
+                      properties:
+                        message:
+                          description: A human-readable description of the status of this operation.
+                          type: string
+                        reason:
+                          description: |-
+                            A machine-readable description of why this operation is in the
+                            "Failure" status. If this value is empty there
+                            is no information available. A Reason clarifies an HTTP status
+                            code but does not override it.
+                          type: string
+                        status:
+                          description: |-
+                            Status of the operation.
+                            One of: "Success" or "Failure".
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+                          type: string
+                      type: object
                   type: object
                 state:
                   description: State is the state of the workflow in Tinkerbell.