ServerAddress Set by ClowdApp

controllers/cloud.redhat.com/providers/autoscaler/keda.go

@@ -70,7 +70,9 @@ func initAutoScaler(env *crd.ClowdEnvironment, app *crd.ClowdApp, d *apps.Deploy
 
 		triggerType := getTriggerRoute(trigger.Type, c, env)
 		for k, v := range triggerType {
-			trigger.Metadata[k] = v
+			if _, exists := trigger.Metadata[k]; !exists {
+				trigger.Metadata[k] = v
+			}
 		}
 		triggers = append(triggers, trigger)
 

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/00-install.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-autoscaler-prom-app-sa
+spec:
+  finalizers:
+  - kubernetes
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-customer-monitoring
+spec:
+  finalizers:
+  - kubernetes

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/01-assert.yaml

@@ -0,0 +1,26 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+collectors:
+- type: command
+  command: bash ../_common/collect-events.sh
+  timeout: 10
+---
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: puptoo-processor
+  namespace: test-autoscaler-prom-app-sa
+spec:
+  maxReplicaCount: 3
+  minReplicaCount: 1
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: puptoo-processor
+  triggers:
+    - metadata:
+        query: sum(promhttp_metric_handler_requests_total{job="puptoo-processor",code="200"})
+        serverAddress: https://app.prometheus.url:2222
+        threshold: '4'
+      type: prometheus

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/01-pods.yaml

@@ -0,0 +1,58 @@
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdEnvironment
+metadata:
+  name: test-autoscaler-prom-app-sa
+spec:
+  targetNamespace: test-autoscaler-prom-app-sa
+  providers:
+    web:
+      port: 8000
+      mode: operator
+    metrics:
+      port: 9000
+      mode: app-interface
+      path: "/metrics"
+      prometheus:
+        appInterfaceInternalURL: https://env.prometheus.url:1111
+    kafka:
+      mode: none
+    db:
+      mode: none
+    logging:
+      mode: none
+    objectStore:
+      mode: none
+    inMemoryDb:
+      mode: none
+    featureFlags:
+      mode: none
+    autoScaler:
+      mode: enabled
+  resourceDefaults:
+    limits:
+      cpu: 400m
+      memory: 1024Mi
+    requests:
+      cpu: 30m
+      memory: 512Mi
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdApp
+metadata:
+  name: puptoo
+  namespace: test-autoscaler-prom-app-sa
+spec:
+  envName: test-autoscaler-prom-app-sa
+  deployments:
+  - name: processor
+    podSpec:
+      image: quay.io/psav/clowder-hello
+    autoScaler:
+      maxReplicaCount: 3
+      triggers:
+      - type: prometheus
+        metadata:
+          serverAddress: https://app.prometheus.url:2222
+          threshold: '4'
+          query: sum(promhttp_metric_handler_requests_total{job="puptoo-processor",code="200"})

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/02-assert.yaml

@@ -0,0 +1,26 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+collectors:
+- type: command
+  command: bash ../_common/collect-events.sh
+  timeout: 10
+---
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: puptoo-processor
+  namespace: test-autoscaler-prom-app-sa
+spec:
+  maxReplicaCount: 3
+  minReplicaCount: 1
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: puptoo-processor
+  triggers:
+    - metadata:
+        query: sum(promhttp_metric_handler_requests_total{job="puptoo-processor",code="200"})
+        serverAddress: https://updated.app.prometheus.url:3333
+        threshold: '4'
+      type: prometheus

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/02-pods.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdApp
+metadata:
+  name: puptoo
+  namespace: test-autoscaler-prom-app-sa
+spec:
+  envName: test-autoscaler-prom-app-sa
+  deployments:
+  - name: processor
+    podSpec:
+      image: quay.io/psav/clowder-hello
+    autoScaler:
+      maxReplicaCount: 3
+      triggers:
+      - type: prometheus
+        metadata:
+          serverAddress: https://updated.app.prometheus.url:3333
+          threshold: '4'
+          query: sum(promhttp_metric_handler_requests_total{job="puptoo-processor",code="200"})

tests/kuttl/test-autoscaler-prometheus-app-serveraddress/03-delete.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: v1
+  kind: Namespace
+  name: test-autoscaler-prom-app-sa
+- apiVersion: v1
+  kind: Namespace
+  name: openshift-customer-monitoring
+- apiVersion: cloud.redhat.com/v1alpha1
+  kind: ClowdEnvironment
+  name: test-autoscaler-prom-app-sa