Ignore SOs that doesn't contain such trigger + make it more DRY (#59)

* Ignore SOs that doesn't contain such trigger + make it more DRY

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>

* Comment for enum

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>

---------

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>

Author: jkremser

helmchart/otel-add-on/templates/vap.yaml

@@ -18,15 +18,24 @@ spec:
       expression: "object.spec.triggers.filter(t, t.type == 'external' && has(t.metadata.scalerAddress) && t.metadata.scalerAddress.contains('otel'))"
     - name: triggers
       expression: "variables.otelScalersWithSugar + variables.otelScalersNoSugar"
-    - name: allowedOperationsOverTime
-      expression: "['avg', 'count', 'last_one', 'min', 'max', 'rate', 'sum']"
+    - name: noTriggers
+      expression: "variables.triggers.size() == 0"
+    - name: allowedOpsOverTime
+      expression: "['avg', 'count', 'last_one', 'min', 'max', 'rate']"
+    - name: allowedOpsOverVectors
+      expression: "['avg', 'count', 'min', 'max', 'sum']"
+    - name: mqRegexp
+      expression: "'^((' + variables.allowedOpsOverVectors.join('|') + ')\\\\()?[a-zA-Z][a-zA-Z0-9-_]*(\\\\{[^,=]+=[^,=]+(,[^,=]+=[^,=]+)*?\\\\})?\\\\)?$'"
   validations:
-    - expression: "variables.triggers.size() > 0 && variables.triggers.all(t, has(t.metadata.targetValue))"
+    - expression: "variables.noTriggers || variables.triggers.all(t, has(t.metadata.targetValue))"
       messageExpression: "'Missing \\'targetValue\\' on ScaledObject\\' otel trigger: ' + object.metadata.name"
-    - expression: "variables.triggers.size() > 0 && variables.triggers.all(t, !has(t.metadata.operationOverTime) || t.metadata.operationOverTime in variables.allowedOperationsOverTime)"
-      messageExpression: "'Malformed trigger in ScaledObject: ' + object.metadata.name + ' unsupported operationOverTime: ' + variables.triggers.filter(t, has(t.metadata.operationOverTime) && !(t.metadata.operationOverTime in variables.allowedOperationsOverTime))[0].metadata.operationOverTime"
-    - expression: "variables.triggers.size() > 0 && variables.triggers.all(t, has(t.metadata.metricQuery) && t.metadata.metricQuery.matches('^((sum|avg|min|max|count)\\\\()?[a-zA-Z][a-zA-Z0-9-_]*(\\\\{[^,=]+=[^,=]+(,[^,=]+=[^,=]+)*?\\\\})?\\\\)?$'))"
-      messageExpression: "'Malformed trigger in ScaledObject: ' + object.metadata.name + ' unsupported metricQuery: ' + variables.triggers.filter(t, !has(t.metadata.metricQuery) || !t.metadata.metricQuery.matches('^((sum|avg|min|max|count)\\\\()?[a-zA-Z][a-zA-Z0-9-_]*(\\\\{[^,=]+=[^,=]+(,[^,=]+=[^,=]+)*?\\\\})?\\\\)?$'))[0].metadata.metricQuery"
+
+    - expression: "variables.noTriggers || variables.triggers.all(t, !has(t.metadata.operationOverTime) || t.metadata.operationOverTime in variables.allowedOpsOverTime)"
+      messageExpression: "'Malformed trigger in ScaledObject: ' + object.metadata.name + ' unsupported operationOverTime: ' + variables.triggers.filter(t, has(t.metadata.operationOverTime) && !(t.metadata.operationOverTime in variables.allowedOpsOverTime))[0].metadata.operationOverTime + ' supported operations: ' + variables.allowedOpsOverTime.join(', ')"
+
+    - expression: "variables.noTriggers || variables.triggers.all(t, has(t.metadata.metricQuery) && t.metadata.metricQuery.matches(variables.mqRegexp))"
+      messageExpression: "'Malformed trigger in ScaledObject: ' + object.metadata.name + ' unsupported metricQuery: ' + variables.triggers.filter(t, !has(t.metadata.metricQuery) || !t.metadata.metricQuery.matches(variables.mqRegexp)).map(t, has(t.metadata.metricQuery) ? t.metadata.metricQuery : 'missing')[0]"
+      reason: "MalformedMetricQuery"
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicyBinding

types/metrics.go

@@ -63,6 +63,8 @@ const (
 	OpAvg   OperationOverTime = "avg"
 	OpMin   OperationOverTime = "min"
 	OpMax   OperationOverTime = "max"
+
+	// when adding new AggregationOverVectors or OperationOverTime, don't forget to change also ValidatingAdmissionPolicy
 )
 
 type MemStore interface {