Fix nodeset status changes with BmhRef hash changes

Attempt 2:

The current logic is still flawed and it would never reach NodeSetReady
after deleting BMHs and running deployment.

Jira: https://issues.redhat.com/browse/OSPRH-14952
Signed-off-by: rabi <[email protected]>

Author: rabi

apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -91,6 +91,10 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              bmhRefHashes:
+                additionalProperties:
+                  type: string
+                type: object
               conditions:
                 items:
                   properties:

apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

@@ -903,6 +903,8 @@ spec:
                     type: string
                   type: object
                 type: object
+              bmhRefHash:
+                type: string
               conditions:
                 items:
                   properties:

apis/dataplane/v1beta1/openstackdataplanedeployment_types.go

@@ -90,6 +90,9 @@ type OpenStackDataPlaneDeploymentStatus struct {
 	// NodeSetHashes
 	NodeSetHashes map[string]string `json:"nodeSetHashes,omitempty" optional:"true"`
 
+	// BmhRefHashes
+	BmhRefHashes map[string]string `json:"bmhRefHashes,omitempty" optional:"true"`
+
 	// ContainerImages
 	ContainerImages map[string]string `json:"containerImages,omitempty"`
 
@@ -185,4 +188,7 @@ func (instance *OpenStackDataPlaneDeployment) InitHashesAndImages() {
 	if instance.Status.ContainerImages == nil {
 		instance.Status.ContainerImages = make(map[string]string)
 	}
+	if instance.Status.BmhRefHashes == nil {
+		instance.Status.BmhRefHashes = make(map[string]string)
+	}
 }

apis/dataplane/v1beta1/openstackdataplanenodeset_types.go

@@ -155,6 +155,9 @@ type OpenStackDataPlaneNodeSetStatus struct {
 	// DeployedVersion
 	DeployedVersion string `json:"deployedVersion,omitempty"`
 
+	// bmhRefHash - Current hash of the BMHs
+	BmhRefHash string `json:"bmhRefHash,omitempty"`
+
 	//DeployedBmhHash - Hash of BMHs deployed
 	DeployedBmhHash string `json:"deployedBmhHash,omitempty"`
 }

apis/dataplane/v1beta1/zz_generated.deepcopy.go

@@ -17922,6 +17922,10 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              bmhRefHashes:
+                additionalProperties:
+                  type: string
+                type: object
               conditions:
                 items:
                   properties:
@@ -18902,6 +18906,8 @@ spec:
                     type: string
                   type: object
                 type: object
+              bmhRefHash:
+                type: string
               conditions:
                 items:
                   properties:

bindata/crds/crds.yaml

@@ -91,6 +91,10 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              bmhRefHashes:
+                additionalProperties:
+                  type: string
+                type: object
               conditions:
                 items:
                   properties:

config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -903,6 +903,8 @@ spec:
                     type: string
                   type: object
                 type: object
+              bmhRefHash:
+                type: string
               conditions:
                 items:
                   properties:

config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

@@ -320,6 +320,7 @@ func (r *OpenStackDataPlaneDeploymentReconciler) Reconcile(ctx context.Context,
 				dataplanev1.NodeSetDeploymentReadyCondition,
 				condition.DeploymentReadyMessage)
 			instance.Status.NodeSetHashes[nodeSet.Name] = nodeSet.Status.ConfigHash
+			instance.Status.BmhRefHashes[nodeSet.Name] = nodeSet.Status.BmhRefHash
 		}
 	}
 

controllers/dataplane/openstackdataplanedeployment_controller.go

@@ -379,10 +379,11 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 		if err != nil || !provResult.IsProvisioned {
 			return ctrl.Result{}, err
 		}
+		instance.Status.BmhRefHash = provResult.BmhRefHash
 	}
 
 	isDeploymentReady, isDeploymentRunning, isDeploymentFailed, failedDeployment, err := checkDeployment(
-		ctx, helper, instance, provResult.BmhRefHash)
+		ctx, helper, instance)
 	if !isDeploymentFailed && err != nil {
 		instance.Status.Conditions.MarkFalse(
 			condition.DeploymentReadyCondition,
@@ -426,7 +427,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 		Log.Info("Set NodeSet DeploymentReadyCondition true")
 		instance.Status.Conditions.MarkTrue(condition.DeploymentReadyCondition,
 			condition.DeploymentReadyMessage)
-		instance.Status.DeployedBmhHash = provResult.BmhRefHash
+		instance.Status.DeployedBmhHash = instance.Status.BmhRefHash
 	} else if isDeploymentRunning {
 		Log.Info("Deployment still running...", "instance", instance)
 		Log.Info("Set NodeSet DeploymentReadyCondition false")
@@ -462,7 +463,6 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 
 func checkDeployment(ctx context.Context, helper *helper.Helper,
 	instance *dataplanev1.OpenStackDataPlaneNodeSet,
-	bmhRefHash string,
 ) (bool, bool, bool, string, error) {
 	// Get all completed deployments
 	var failedDeployment string
@@ -520,8 +520,8 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,
 				// If the nodeset configHash does not match with what's in the deployment or
 				// deployedBmhHash is different from current bmhRefHash.
 				if (deployment.Status.NodeSetHashes[instance.Name] != instance.Status.ConfigHash) ||
-					(!instance.Spec.PreProvisioned && instance.Status.DeployedBmhHash != "" &&
-						instance.Status.DeployedBmhHash != bmhRefHash) {
+					(!instance.Spec.PreProvisioned &&
+						deployment.Status.BmhRefHashes[instance.Name] != instance.Status.BmhRefHash) {
 					continue
 				}
 				isDeploymentReady = true