Move utility functions to utility package.

Signed-off-by: Humair Khan <[email protected]>

Author: HumairAK

controllers/dspipeline_controller.go

@@ -23,6 +23,7 @@ import (
 	mf "github.com/manifestival/manifestival"
 	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
 	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/config"
+	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/util"
 	routev1 "github.com/openshift/api/route/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -121,16 +122,6 @@ func (r *DSPAReconciler) buildCondition(conditionType string, dspa *dspav1alpha1
 	return condition
 }
 
-func GetDeploymentCondition(status appsv1.DeploymentStatus, condType appsv1.DeploymentConditionType) *appsv1.DeploymentCondition {
-	for i := range status.Conditions {
-		c := status.Conditions[i]
-		if c.Type == condType {
-			return &c
-		}
-	}
-	return nil
-}
-
 //+kubebuilder:rbac:groups=datasciencepipelinesapplications.opendatahub.io,resources=datasciencepipelinesapplications,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=datasciencepipelinesapplications.opendatahub.io,resources=datasciencepipelinesapplications/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=datasciencepipelinesapplications.opendatahub.io,resources=datasciencepipelinesapplications/finalizers,verbs=update
@@ -278,26 +269,15 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 
 	r.PublishMetrics(
 		dspa,
-		GetConditionByType(config.APIServerReady, conditions),
-		GetConditionByType(config.PersistenceAgentReady, conditions),
-		GetConditionByType(config.ScheduledWorkflowReady, conditions),
-		GetConditionByType(config.CrReady, conditions),
+		util.GetConditionByType(config.APIServerReady, conditions),
+		util.GetConditionByType(config.PersistenceAgentReady, conditions),
+		util.GetConditionByType(config.ScheduledWorkflowReady, conditions),
+		util.GetConditionByType(config.CrReady, conditions),
 	)
 
 	return ctrl.Result{}, nil
 }
 
-// GetConditionByType returns condition of type T if it exists in conditions, otherwise
-// return empty condition struct.
-func GetConditionByType(t string, conditions []metav1.Condition) metav1.Condition {
-	for _, c := range conditions {
-		if c.Type == t {
-			return c
-		}
-	}
-	return metav1.Condition{}
-}
-
 // isDeploymentInCondition evaluates if condition with "name" is in condition of type "conditionType".
 // this procedure is valid only for conditions with bool status type, for conditions of non bool type
 // results are undefined.
@@ -331,9 +311,9 @@ func (r *DSPAReconciler) handleReadyCondition(
 	// 2. Component is still deploying
 	// We check for (1), and if no errors are found we presume (2)
 
-	progressingCond := GetDeploymentCondition(deployment.Status, appsv1.DeploymentProgressing)
-	availableCond := GetDeploymentCondition(deployment.Status, appsv1.DeploymentAvailable)
-	replicaFailureCond := GetDeploymentCondition(deployment.Status, appsv1.DeploymentReplicaFailure)
+	progressingCond := util.GetDeploymentCondition(deployment.Status, appsv1.DeploymentProgressing)
+	availableCond := util.GetDeploymentCondition(deployment.Status, appsv1.DeploymentAvailable)
+	replicaFailureCond := util.GetDeploymentCondition(deployment.Status, appsv1.DeploymentReplicaFailure)
 
 	if availableCond != nil && availableCond.Status == corev1.ConditionTrue {
 		// If this DSPA component is minimally available, we are done.

controllers/util/util.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package util
+
+import (
+	appsv1 "k8s.io/api/apps/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// GetConditionByType returns condition of type T if it exists in conditions, otherwise
+// return empty condition struct.
+func GetConditionByType(t string, conditions []metav1.Condition) metav1.Condition {
+	for _, c := range conditions {
+		if c.Type == t {
+			return c
+		}
+	}
+	return metav1.Condition{}
+}
+
+func GetDeploymentCondition(status appsv1.DeploymentStatus, condType appsv1.DeploymentConditionType) *appsv1.DeploymentCondition {
+	for i := range status.Conditions {
+		c := status.Conditions[i]
+		if c.Type == condType {
+			return &c
+		}
+	}
+	return nil
+}