handle older crds (#76)

* update elastiService definition * handle older elastiServices and improve error logging * omit nil check as len() handles it
truefoundry · Feb 7, 2025 · c9479aa · c9479aa
1 parent 5ce669f
commit c9479aa
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 9 deletions.
diff --git a/charts/elasti/templates/elastiservice-crd.yaml b/charts/elasti/templates/elastiservice-crd.yaml
@@ -40,6 +40,19 @@ spec:
           spec:
             description: ElastiServiceSpec defines the desired state of ElastiService
             properties:
+              autoscaler:
+                properties:
+                  name:
+                    type: string
+                  type:
+                    type: string
+                required:
+                  - name
+                  - type
+                type: object
+              cooldownPeriod:
+                format: int32
+                type: integer
               minTargetReplicas:
                 format: int32
                 type: integer
@@ -57,6 +70,17 @@ spec:
                 type: object
               service:
                 type: string
+              triggers:
+                items:
+                  properties:
+                    metadata:
+                      x-kubernetes-preserve-unknown-fields: true
+                    type:
+                      type: string
+                  required:
+                    - type
+                  type: object
+                type: array
             type: object
           status:
             description: ElastiServiceStatus defines the observed state of ElastiService
@@ -67,6 +91,9 @@ spec:
                   Important: Run "make" to regenerate code after modifying this file
                 format: date-time
                 type: string
+              lastScaledUpTime:
+                format: date-time
+                type: string
               mode:
                 type: string
             type: object

diff --git a/pkg/scaling/scale_handler.go b/pkg/scaling/scale_handler.go
@@ -124,15 +124,19 @@ func (h *ScaleHandler) handleScaleToZero(ctx context.Context, es *v1alpha1.Elast
 		Namespace: es.Namespace,
 	}
 	shouldScale := true
+	if len(es.Spec.Triggers) == 0 {
+		h.logger.Info("No triggers found, skipping scale to zero", zap.String("namespacedName", namespacedName.String()))
+		return nil
+	}
 	for _, trigger := range es.Spec.Triggers {
 		scaler, err := h.createScalerForTrigger(&trigger)
 		if err != nil {
-			return fmt.Errorf("failed to create scaler for trigger: %w", err)
+			return fmt.Errorf("failed to create scaler for %s: %w", namespacedName.String(), err)
 		}
 
 		scalerResult, err := scaler.ShouldScaleToZero(ctx)
 		if err != nil {
-			return fmt.Errorf("failed to check scaler: %w", err)
+			return fmt.Errorf("failed to check scaler for %s: %w", namespacedName.String(), err)
 		}
 		if !scalerResult {
 			shouldScale = false
@@ -141,7 +145,7 @@ func (h *ScaleHandler) handleScaleToZero(ctx context.Context, es *v1alpha1.Elast
 
 		err = scaler.Close(ctx)
 		if err != nil {
-			h.logger.Error("failed to close scaler", zap.Error(err))
+			h.logger.Error("failed to close scaler", zap.String("namespacedName", namespacedName.String()), zap.Error(err))
 		}
 	}
 	if !shouldScale {
@@ -159,6 +163,9 @@ func (h *ScaleHandler) handleScaleToZero(ctx context.Context, es *v1alpha1.Elast
 	// Check cooldown period
 	if es.Status.LastScaledUpTime != nil {
 		cooldownPeriod := time.Second * time.Duration(es.Spec.CooldownPeriod)
+		if cooldownPeriod == 0 {
+			cooldownPeriod = values.DefaultCooldownPeriod
+		}
 
 		if time.Since(es.Status.LastScaledUpTime.Time) < cooldownPeriod {
 			h.logger.Info("Skipping scale down as minimum cooldownPeriod not met",
@@ -181,17 +188,21 @@ func (h *ScaleHandler) handleScaleFromZero(ctx context.Context, es *v1alpha1.Ela
 		Namespace: es.Namespace,
 	}
 	shouldScale := false
+	if len(es.Spec.Triggers) == 0 {
+		h.logger.Info("No triggers found, skipping scale from zero", zap.String("namespacedName", namespacedName.String()))
+		return nil
+	}
 	for _, trigger := range es.Spec.Triggers {
 		scaler, err := h.createScalerForTrigger(&trigger)
 		if err != nil {
-			h.logger.Error("failed to create scaler for trigger", zap.Error(err))
+			h.logger.Error("failed to create scaler for trigger", zap.String("namespacedName", namespacedName.String()), zap.Error(err))
 			shouldScale = true
 			break
 		}
 
 		scalerResult, err := scaler.ShouldScaleFromZero(ctx)
 		if err != nil {
-			h.logger.Error("failed to check scaler", zap.Error(err))
+			h.logger.Error("failed to check scaler", zap.String("namespacedName", namespacedName.String()), zap.Error(err))
 			shouldScale = true
 			break
 		}
@@ -202,7 +213,7 @@ func (h *ScaleHandler) handleScaleFromZero(ctx context.Context, es *v1alpha1.Ela
 
 		err = scaler.Close(ctx)
 		if err != nil {
-			h.logger.Error("failed to close scaler", zap.Error(err))
+			h.logger.Error("failed to close scaler", zap.String("namespacedName", namespacedName.String()), zap.Error(err))
 		}
 	}
 	if !shouldScale {

diff --git a/pkg/scaling/scalers/prometheus_scaler.go b/pkg/scaling/scalers/prometheus_scaler.go
@@ -145,9 +145,12 @@ func (s *prometheusScaler) executePromQuery(ctx context.Context) (float64, error
 func (s *prometheusScaler) ShouldScaleToZero(ctx context.Context) (bool, error) {
 	metricValue, err := s.executePromQuery(ctx)
 	if err != nil {
-		return false, fmt.Errorf("failed to execute prometheus query: %w", err)
+		return false, fmt.Errorf("failed to execute prometheus query %s: %w", s.metadata.Query, err)
 	}
 
+	if metricValue == -1 {
+		return false, nil
+	}
 	if metricValue < s.metadata.Threshold {
 		return true, nil
 	}
@@ -157,7 +160,10 @@ func (s *prometheusScaler) ShouldScaleToZero(ctx context.Context) (bool, error)
 func (s *prometheusScaler) ShouldScaleFromZero(ctx context.Context) (bool, error) {
 	metricValue, err := s.executePromQuery(ctx)
 	if err != nil {
-		return false, fmt.Errorf("failed to execute prometheus query: %w", err)
+		return true, fmt.Errorf("failed to execute prometheus query %s: %w", s.metadata.Query, err)
+	}
+	if metricValue == -1 {
+		return true, nil
 	}
 
 	if metricValue >= s.metadata.Threshold {

diff --git a/pkg/values/values.go b/pkg/values/values.go
@@ -1,6 +1,10 @@
 package values
 
-import "k8s.io/apimachinery/pkg/runtime/schema"
+import (
+	"time"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
 
 const (
 	ArgoPhaseHealthy              = "Healthy"
@@ -15,6 +19,8 @@ const (
 	NullMode  = ""
 
 	Success = "success"
+
+	DefaultCooldownPeriod = time.Second * 300
 )
 
 var (