Update NodeSet condition message when Deployment hasn't started yet

fao89 · fao89 · commit ad5895ee0d4d · 2025-02-20T11:41:15.000Z
closes OSPRH-10047

Signed-off-by: Fabricio Aguiar &lt;fabricio.aguiar@gmail.com&gt;
diff --git a/apis/dataplane/v1beta1/conditions.go b/apis/dataplane/v1beta1/conditions.go
@@ -92,14 +92,8 @@ const (
 	// NodeSet Deployment is finished and successful.
 	NodeSetDeploymentReadyCondition condition.Type = "NodeSetDeploymentReady"
 
-	// NodeSetDeploymentReadyMessage ready
-	NodeSetDeploymentReadyMessage = "Deployment ready for NodeSet"
-
 	// NodeSetDeploymentReadyWaitingMessage not yet ready
-	NodeSetDeploymentReadyWaitingMessage = "Deployment not yet ready for NodeSet"
-
-	// NodeSetDeploymentErrorMessage error
-	NodeSetDeploymentErrorMessage = "Deployment error occurred %s for NodeSet"
+	NodeSetDeploymentReadyWaitingMessage = "NodeSet setup ready, waiting for Deployment..."
 
 	// NodeSetServiceDeploymentReadyMessage ready
 	NodeSetServiceDeploymentReadyMessage = "Deployment ready for %s service"
diff --git a/controllers/dataplane/openstackdataplanenodeset_controller.go b/controllers/dataplane/openstackdataplanenodeset_controller.go
@@ -423,7 +423,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
 		Log.Info("Set NodeSet DeploymentReadyCondition false")
 		instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition,
 			condition.RequestedReason, condition.SeverityInfo,
-			condition.DeploymentReadyInitMessage)
+			dataplanev1.NodeSetDeploymentReadyWaitingMessage)
 	}
 
 	if isDeploymentReady {
diff --git a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc
@@ -308,7 +308,7 @@ $ oc create -f openstack-edpm.yaml
 ----
 $ oc get openstackdataplanenodeset
 NAME           		STATUS MESSAGE
-openstack-edpm-ipam 	False  Deployment not started
+openstack-edpm-ipam 	False  NodeSet setup ready, waiting for Deployment...
 ----
 
 . Verify that the `Secret` resource was created for the node set:
diff --git a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-create-test/00-assert.yaml
@@ -79,11 +79,11 @@ status:
       tenant: 172.19.0.100
   ctlplaneSearchDomain: ctlplane.example.com
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml
@@ -106,12 +106,12 @@ spec:
 status:
   observedGeneration: 1
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     severity: Info
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     severity: Info
     status: "False"
diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-assert.yaml
@@ -123,11 +123,11 @@ spec:
 status:
   observedGeneration: 1
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-assert.yaml
@@ -38,11 +38,11 @@ spec:
 status:
   observedGeneration: 1
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/00-assert.yaml
@@ -94,11 +94,11 @@ spec:
 status:
   observedGeneration: 1
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-assert.yaml
@@ -28,11 +28,11 @@ status:
   observedGeneration: 1
   ctlplaneSearchDomain: ctlplane.example.com
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-assert.yaml
@@ -17,11 +17,11 @@ status:
       tenant: 172.19.0.150
   ctlplaneSearchDomain: ctlplane.example.com
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady
diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-assert.yaml
@@ -27,11 +27,11 @@ status:
       tenant: 172.19.0.151
   ctlplaneSearchDomain: ctlplane.example.com
   conditions:
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: Ready
-  - message: Deployment not started
+  - message: NodeSet setup ready, waiting for Deployment...
     reason: Requested
     status: "False"
     type: DeploymentReady

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req`
`423`	`423`	`Log.Info("Set NodeSet DeploymentReadyCondition false")`
`424`	`424`	`instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition,`
`425`	`425`	`condition.RequestedReason, condition.SeverityInfo,`
`426`		`- condition.DeploymentReadyInitMessage)`
	`426`	`+ dataplanev1.NodeSetDeploymentReadyWaitingMessage)`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`if isDeploymentReady {`