Merge pull request #873 from fao89/init

Use the specific init message
openstack-k8s-operators · May 7, 2024 · a62d9da · a62d9da
2 parents cffcd24 + 4c77e75
commit a62d9da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/v1beta1/openstackdataplanedeployment_types.go b/api/v1beta1/openstackdataplanedeployment_types.go
@@ -131,16 +131,16 @@ func (instance *OpenStackDataPlaneDeployment) InitConditions() {
 	instance.Status.Conditions = condition.Conditions{}
 
 	cl := condition.CreateList(
-		condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.InitReason),
-		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InitReason),
+		condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage),
+		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InputReadyInitMessage),
 	)
 	instance.Status.Conditions.Init(&cl)
 	instance.Status.NodeSetConditions = make(map[string]condition.Conditions)
 	if instance.Spec.NodeSets != nil {
 		for _, nodeSet := range instance.Spec.NodeSets {
 			nsConds := condition.Conditions{}
 			nsConds.Set(condition.UnknownCondition(
-				NodeSetDeploymentReadyCondition, condition.InitReason, condition.InitReason))
+				NodeSetDeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage))
 			instance.Status.NodeSetConditions[nodeSet] = nsConds
 
 		}

diff --git a/api/v1beta1/openstackdataplanenodeset_types.go b/api/v1beta1/openstackdataplanenodeset_types.go
@@ -174,12 +174,12 @@ func (instance *OpenStackDataPlaneNodeSet) InitConditions() {
 	instance.Status.DeploymentStatuses = make(map[string]condition.Conditions)
 
 	cl := condition.CreateList(
-		condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.InitReason),
-		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InitReason),
+		condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage),
+		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InputReadyInitMessage),
 		condition.UnknownCondition(SetupReadyCondition, condition.InitReason, condition.InitReason),
 		condition.UnknownCondition(NodeSetIPReservationReadyCondition, condition.InitReason, condition.InitReason),
 		condition.UnknownCondition(NodeSetDNSDataReadyCondition, condition.InitReason, condition.InitReason),
-		condition.UnknownCondition(condition.ServiceAccountReadyCondition, condition.InitReason, condition.InitReason),
+		condition.UnknownCondition(condition.ServiceAccountReadyCondition, condition.InitReason, condition.ServiceAccountReadyInitMessage),
 	)
 
 	// Only set Baremetal related conditions if we have baremetal hosts included in the