Update values.yaml with mqt keda configuration (#1670)

charts/fission-all/templates/deployment.yaml

@@ -883,7 +883,9 @@ spec:
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
         - name: KAFKA_IMAGE
-          value: {{ .Values.mqt_keda.connector_images.kafka }}
+          value: "{{ .Values.mqt_keda.connector_images.kafka.image }}:{{ .Values.mqt_keda.connector_images.kafka.tag }}"
+        - name: RABBITMQ_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.rabbitmq.image }}:{{ .Values.mqt_keda.connector_images.rabbitmq.tag }}"
       serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}

charts/fission-all/values.yaml

@@ -151,7 +151,7 @@ nats:
 
   # Address of NATS server (domain:port)
   # change from default for external NATS
-  hostaddress: 'nats-streaming:4222'
+  hostaddress: "nats-streaming:4222"
 
   # Authorization token to use with NATS
   authToken: "defaultFissionAuthToken"
@@ -180,13 +180,14 @@ kafka:
   enabled: false
   # note: below link is only for reference.
   # Please use the brokers link for your kafka here.
-  brokers: 'broker.kafka:9092' # or your-bootstrap-server.kafka:9092/9093
+  brokers: "broker.kafka:9092" # or your-bootstrap-server.kafka:9092/9093
   authentication:
     tls:
       enabled: false
-      caCert: '' # path to certificate containing public key of CA authority
-      userCert: '' # path to certificate containing public key of the user signed by CA authority
-      userKey: '' # path to private key of the user
+      caCert: "" # path to certificate containing public key of CA authority
+      userCert: "" # path to certificate containing public key of the user signed by CA authority
+      userKey: "" # path to private key of the user
+
 
   # brokers: 'my-broker.kafka:9092' # or my-bootstrap-server.kafka:9092/9093
   # Sample config for authentication
@@ -308,6 +309,11 @@ canaryDeployment:
 
 ## Message Queue Trigger Kind, KEDA: enable and configuration
 mqt_keda:
-  enabled: true
+  enabled: false
   connector_images:
-    kafka: fission/keda-kafka
+    kafka:
+      image: fission/keda-kafka-http-connector
+      tag: 1
+    rabbitmq:
+      image: fission/keda-rabbitmq-http-connector
+      tag: 1

charts/fission-core/templates/deployment.yaml

@@ -446,3 +446,48 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+
+{{- if .Values.mqt_keda.enabled }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mqtrigger-keda
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    svc: mqtrigger-keda
+    messagequeue: keda
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      svc: mqtrigger-keda
+      messagequeue: keda
+  template:
+    metadata:
+      labels:
+        svc: mqtrigger-keda
+        messagequeue: keda
+    spec:
+      containers:
+      - name:  mqtrigger-keda
+        image: {{ include "fission-bundleImage" . | quote }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command: ["/fission-bundle"]
+        args: ["--mqt_keda", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
+        env:
+        - name: TRACE_JAEGER_COLLECTOR_ENDPOINT
+          value: "{{ .Values.traceCollectorEndpoint }}"
+        - name: TRACING_SAMPLING_RATE
+          value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
+        - name: DEBUG_ENV
+          value: {{ .Values.debugEnv | quote }}
+        - name: KAFKA_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.kafka.image }}:{{ .Values.mqt_keda.connector_images.kafka.tag }}"
+        - name: RABBITMQ_IMAGE
+          value: "{{ .Values.mqt_keda.connector_images.rabbitmq.image }}:{{ .Values.mqt_keda.connector_images.rabbitmq.tag }}"
+      serviceAccountName: fission-svc
+{{- if .Values.extraCoreComponentPodConfig }}
+{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
+{{- end }}
+{{- end }}

charts/fission-core/values.yaml

@@ -197,3 +197,14 @@ canaryDeployment:
 # Use these flags to enable opentracing, the variable is endpoint of Jaeger collector in the format shown below
 #traceCollectorEndpoint: "http://jaeger-collector.jaeger.svc:14268/api/traces?format=jaeger.thrift"
 #traceSamplingRate: 0.75
+
+## Message Queue Trigger Kind, KEDA: enable and configuration
+mqt_keda:
+  enabled: false
+  connector_images:
+    kafka:
+      image: fission/keda-kafka-http-connector
+      tag: 1
+    rabbitmq:
+      image: fission/keda-rabbitmq-http-connector
+      tag: 1