check presence of scaleTargetRef or jobTargetRef (#648)

kedacore · Mar 2, 2020 · 2de3a4c · 2de3a4c
1 parent ae4c437
commit 2de3a4c
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/pkg/controller/scaledobject/scaledobject_controller.go b/pkg/controller/scaledobject/scaledobject_controller.go
@@ -148,13 +148,25 @@ func (r *ReconcileScaledObject) Reconcile(request reconcile.Request) (reconcile.
 	}
 
 	reqLogger.V(1).Info("Detecting ScaleType from ScaledObject")
-	if scaledObject.Spec.ScaleTargetRef == nil || scaledObject.Spec.ScaleTargetRef.DeploymentName == "" {
+	var errMsg string
+	if scaledObject.Spec.ScaleTargetRef != nil {
+		if scaledObject.Spec.JobTargetRef == nil {
+			reqLogger.Info("Detected ScaleType = Deployment")
+			return r.reconcileDeploymentType(reqLogger, scaledObject)
+		}
+		errMsg = "Both ScaledObject.Spec.ScaleTargetRef and ScaledObject.Spec.JobTargetRef cannot be set at the same time"
+	} else if scaledObject.Spec.JobTargetRef != nil {
 		reqLogger.Info("Detected ScaleType = Job")
 		return r.reconcileJobType(reqLogger, scaledObject)
 	} else {
-		reqLogger.Info("Detected ScaleType = Deployment")
-		return r.reconcileDeploymentType(reqLogger, scaledObject)
+		errMsg = "ScaledObject.Spec.ScaleTargetRef or ScaledObject.Spec.JobTargetRef is not set"
+	}
+	if errMsg == "" {
+		errMsg = "Unknown error while detecting ScaleType"
 	}
+	err = fmt.Errorf(errMsg)
+	reqLogger.Error(err, "Failed to detect ScaleType")
+	return reconcile.Result{}, err
 }
 
 // reconcileJobType implemets reconciler logic for K8s Jobs based ScaleObject