Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rahul Bhati
2020-08-27 21:45:46 +05:30
committed by GitHub
parent f751546913
commit 22f385b809
4 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/fission-all/templates/deployment.yaml
+3 -1
View File
@@ -883,7 +883,9 @@ spec:
- name: DEBUG_ENV - name: DEBUG_ENV
value: {{ .Values.debugEnv | quote }} value: {{ .Values.debugEnv | quote }}
- name: KAFKA_IMAGE - 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 serviceAccountName: fission-svc
{{- if .Values.extraCoreComponentPodConfig }} {{- if .Values.extraCoreComponentPodConfig }}
{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
charts/fission-all/values.yaml
+29 -23
View File
@@ -51,7 +51,7 @@ fetcher:
image: fission/fetcher image: fission/fetcher
## Fetcher image version ## Fetcher image version
imageTag: 1.10.0 imageTag: 1.10.0
## Fetcher is only for to downloading or uploading archive. ## Fetcher is only for to downloading or uploading archive.
## Normally, you don't need to change the value here, unless necessary. ## Normally, you don't need to change the value here, unless necessary.
resource: resource:
@@ -69,7 +69,7 @@ logger:
fluentdImageRepository: index.docker.io fluentdImageRepository: index.docker.io
fluentdImage: fluent/fluent-bit fluentdImage: fluent/fluent-bit
fluentdImageTag: 1.5.1 fluentdImageTag: 1.5.1
## Fluent-bit writes/reads it’s own sqlite database to record a history of tracked ## Fluent-bit writes/reads it’s own sqlite database to record a history of tracked
## files and a state of offsets, this is very useful to resume a state if the ser- ## files and a state of offsets, this is very useful to resume a state if the ser-
## vice is restarted. For Kubernetes environment with constraints like OpenShift, ## vice is restarted. For Kubernetes environment with constraints like OpenShift,
@@ -81,7 +81,7 @@ logger:
## Only required in some clusters and when enableSecurityContext is true ## Only required in some clusters and when enableSecurityContext is true
podSecurityPolicy: podSecurityPolicy:
enabled: false enabled: false
## Configure additional capabilities ## Configure additional capabilities
additionalCapabilities: additionalCapabilities:
# example values for linkerd # example values for linkerd
@@ -96,21 +96,21 @@ router:
deployAsDaemonSet: false deployAsDaemonSet: false
svcAddressMaxRetries: 5 svcAddressMaxRetries: 5
svcAddressUpdateTimeout: 30s svcAddressUpdateTimeout: 30s
## Display endpoint access logs ## Display endpoint access logs
## To be aware of enabling logging endpoint access log, it increases ## To be aware of enabling logging endpoint access log, it increases
## router resource utilization when under heavy workloads. ## router resource utilization when under heavy workloads.
displayAccessLog: false displayAccessLog: false
## Add annotations for router ## Add annotations for router
# svcAnnotations: # svcAnnotations:
# cloud.google.com/load-balancer-type: Internal # cloud.google.com/load-balancer-type: Internal
## For router to match encoded path. ## For router to match encoded path.
## If true, "/foo%2Fbar" will match the path "/{var}"; ## If true, "/foo%2Fbar" will match the path "/{var}";
## Otherwise, it will match the path "/foo/bar". ## Otherwise, it will match the path "/foo/bar".
useEncodedPath: false useEncodedPath: false
roundTrip: roundTrip:
## If true, router will disable the HTTP keep-alive which result in performance degradation. ## If true, router will disable the HTTP keep-alive which result in performance degradation.
## But it ensures that router can redirect new coming requests to new function pods. ## But it ensures that router can redirect new coming requests to new function pods.
@@ -151,7 +151,7 @@ nats:
# Address of NATS server (domain:port) # Address of NATS server (domain:port)
# change from default for external NATS # change from default for external NATS
hostaddress: 'nats-streaming:4222' hostaddress: "nats-streaming:4222"
# Authorization token to use with NATS # Authorization token to use with NATS
authToken: "defaultFissionAuthToken" authToken: "defaultFissionAuthToken"
@@ -159,34 +159,35 @@ nats:
# NATS streaming clusterID # NATS streaming clusterID
clusterID: "fissionMQTrigger" clusterID: "fissionMQTrigger"
# Client name registered with NATS streaming # Client name registered with NATS streaming
clientID: "fission" clientID: "fission"
# Queue group registered with NATS streaming # Queue group registered with NATS streaming
queueGroup: "fission-messageQueueNatsTrigger" queueGroup: "fission-messageQueueNatsTrigger"
# The image to use for NATS streaming server # The image to use for NATS streaming server
streamingserver: streamingserver:
image: nats-streaming image: nats-streaming
## Azure-storage-queue: enable and configure the details ## Azure-storage-queue: enable and configure the details
azureStorageQueue: azureStorageQueue:
enabled: false enabled: false
key: "" key: ""
accountName: "" accountName: ""
## Kafka: enable and configure the details ## Kafka: enable and configure the details
kafka: kafka:
enabled: false enabled: false
# note: below link is only for reference. # note: below link is only for reference.
# Please use the brokers link for your kafka here. # 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: authentication:
tls: tls:
enabled: false enabled: false
caCert: '' # path to certificate containing public key of CA authority caCert: "" # path to certificate containing public key of CA authority
userCert: '' # path to certificate containing public key of the user signed by CA authority userCert: "" # path to certificate containing public key of the user signed by CA authority
userKey: '' # path to private key of the user userKey: "" # path to private key of the user
# brokers: 'my-broker.kafka:9092' # or my-bootstrap-server.kafka:9092/9093 # brokers: 'my-broker.kafka:9092' # or my-bootstrap-server.kafka:9092/9093
# Sample config for authentication # Sample config for authentication
@@ -241,7 +242,7 @@ persistence:
accessMode: ReadWriteOnce accessMode: ReadWriteOnce
size: 8Gi size: 8Gi
## Extend the container specs for the core fission pods. ## Extend the container specs for the core fission pods.
## Can be used to add things like affinty/tolerations/nodeSelectors/etc. ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
## For example: ## For example:
## extraCoreComponentPodConfig: ## extraCoreComponentPodConfig:
@@ -270,7 +271,7 @@ analyticsNonHelmInstall: false
heapster: false heapster: false
## Enable InfluxDB ## Enable InfluxDB
influxdb: influxdb:
enabled: true enabled: true
image: influxdb:1.7 image: influxdb:1.7
@@ -293,7 +294,7 @@ debugEnv: false
prometheus: prometheus:
## set this flag to true if prometheus needs to be deployed along with fission ## set this flag to true if prometheus needs to be deployed along with fission
enabled: true enabled: true
## If enabled is false, please assign the prometheus service URL ## If enabled is false, please assign the prometheus service URL
## that is accessible by components. ## that is accessible by components.
serviceEndpoint: "" serviceEndpoint: ""
@@ -308,6 +309,11 @@ canaryDeployment:
## Message Queue Trigger Kind, KEDA: enable and configuration ## Message Queue Trigger Kind, KEDA: enable and configuration
mqt_keda: mqt_keda:
enabled: true enabled: false
connector_images: 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
+45
View File
@@ -446,3 +446,48 @@ spec:
{{- if .Values.extraCoreComponentPodConfig }} {{- if .Values.extraCoreComponentPodConfig }}
{{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
{{- end }} {{- 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
+18 -7
View File
@@ -44,7 +44,7 @@ fetcher:
image: fission/fetcher image: fission/fetcher
## Fetcher image version ## Fetcher image version
imageTag: 1.10.0 imageTag: 1.10.0
## Fetcher is only for to downloading or uploading archive. ## Fetcher is only for to downloading or uploading archive.
## Normally, you don't need to change the value here, unless necessary. ## Normally, you don't need to change the value here, unless necessary.
resource: resource:
@@ -64,21 +64,21 @@ router:
deployAsDaemonSet: false deployAsDaemonSet: false
svcAddressMaxRetries: 5 svcAddressMaxRetries: 5
svcAddressUpdateTimeout: 30s svcAddressUpdateTimeout: 30s
## Display endpoint access logs ## Display endpoint access logs
## To be aware of enabling logging endpoint access log, it increases ## To be aware of enabling logging endpoint access log, it increases
## router resource utilization when under heavy workloads. ## router resource utilization when under heavy workloads.
displayAccessLog: false displayAccessLog: false
## Add annotations for router ## Add annotations for router
# svcAnnotations: # svcAnnotations:
# cloud.google.com/load-balancer-type: Internal # cloud.google.com/load-balancer-type: Internal
## For router to match encoded path. ## For router to match encoded path.
## If true, "/foo%2Fbar" will match the path "/{var}"; ## If true, "/foo%2Fbar" will match the path "/{var}";
## Otherwise, it will match the path "/foo/bar". ## Otherwise, it will match the path "/foo/bar".
useEncodedPath: false useEncodedPath: false
roundTrip: roundTrip:
## If true, router will disable the HTTP keep-alive which result in performance degradation. ## If true, router will disable the HTTP keep-alive which result in performance degradation.
## But it ensures that router can redirect new coming requests to new function pods. ## But it ensures that router can redirect new coming requests to new function pods.
@@ -144,7 +144,7 @@ persistence:
accessMode: ReadWriteOnce accessMode: ReadWriteOnce
size: 8Gi size: 8Gi
## Extend the container specs for the core fission pods. ## Extend the container specs for the core fission pods.
## Can be used to add things like affinty/tolerations/nodeSelectors/etc. ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
## For example: ## For example:
## extraCoreComponentPodConfig: ## extraCoreComponentPodConfig:
@@ -185,7 +185,7 @@ debugEnv: false
prometheus: prometheus:
## set this flag to true if prometheus needs to be deployed along with fission ## set this flag to true if prometheus needs to be deployed along with fission
enabled: false enabled: false
## If enabled is false, please assign the prometheus service URL ## If enabled is false, please assign the prometheus service URL
## that is accessible by components. ## that is accessible by components.
serviceEndpoint: "" serviceEndpoint: ""
@@ -197,3 +197,14 @@ canaryDeployment:
# Use these flags to enable opentracing, the variable is endpoint of Jaeger collector in the format shown below # 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" #traceCollectorEndpoint: "http://jaeger-collector.jaeger.svc:14268/api/traces?format=jaeger.thrift"
#traceSamplingRate: 0.75 #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