diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go index bc16dbe607f..2ad2e4b4132 100644 --- a/controllers/datasciencecluster/datasciencecluster_controller.go +++ b/controllers/datasciencecluster/datasciencecluster_controller.go @@ -303,7 +303,7 @@ func (r *DataScienceClusterReconciler) reconcileSubComponent(ctx context.Context // only set to init condition e.g Unknonw for the very first time when component is not in the list if !isExistStatus { instance, err := status.UpdateWithRetry(ctx, r.Client, instance, func(saved *dscv1.DataScienceCluster) { - status.UpdateCondition(&saved.Status.Conditions, status.InitComponentCondition(componentName, enabled)) + status.NewComponentCondition(&saved.Status.Conditions, componentName, enabled) }) if err != nil { _ = r.reportError(err, instance, "failed to update DataScienceCluster conditions before first time reconciling "+componentName) diff --git a/controllers/status/component_condition.go b/controllers/status/component_condition.go index 37ffebc91e9..928c387963c 100644 --- a/controllers/status/component_condition.go +++ b/controllers/status/component_condition.go @@ -5,21 +5,21 @@ import ( corev1 "k8s.io/api/core/v1" ) -// Component init condition. +// Component init condition when it is just created // type: Ready // status: Unknown // reason: ReconcileStart -func InitComponentCondition(componentName string, enabled bool) conditionsv1.Condition { +func NewComponentCondition(conditions *[]conditionsv1.Condition, componentName string, enabled bool) { managementstatue := "not Managed" if enabled { managementstatue = "Managed" } - return conditionsv1.Condition{ + conditionsv1.SetStatusCondition(conditions, conditionsv1.Condition{ Type: conditionsv1.ConditionType(componentName + PhaseReady), Status: corev1.ConditionUnknown, Reason: ReconcileStartReason, Message: "Component managementStatus is " + managementstatue, - } + }) } // Component reconilce success. diff --git a/controllers/status/doc.go b/controllers/status/doc.go index 027d532219b..1c05317d1ee 100644 --- a/controllers/status/doc.go +++ b/controllers/status/doc.go @@ -40,7 +40,7 @@ // doServiceMeshStuff manages the Service Mesh configuration process during DSCInitialization reconcile. // It creates a reporter and reports any conditions derived from the service mesh configuration process. // -// func (r *DSCInitializationReconciler) doStdoServiceMeshStuffff(instance *dsciv1.DSCInitialization) error { +// func (r *DSCInitializationReconciler) doServiceMeshStuff(instance *dsciv1.DSCInitialization) error { // reporter := createReporter(r.Client, instance, &conditionsv1.Condition{ // Type: status.CapabilityServiceMesh, // Status: corev1.ConditionTrue,