Make queueMode a top level value.

Signed-off-by: Han Verstraete (OpenFaaS Ltd) <[email protected]>

Author: welteki

chart/openfaas/templates/gateway-dep.yaml

@@ -137,8 +137,8 @@ spec:
           value: "{{ .Values.nats.channel }}"
         {{- end }}
         {{- end }}
-        {{- if or .Values.nats.external.enabled (eq .Values.nats.queueMode "jetstream") }}
-        {{- if eq .Values.nats.queueMode "jetstream" }}
+        {{- if or .Values.nats.external.enabled (eq .Values.queueMode "jetstream") }}
+        {{- if eq .Values.queueMode "jetstream" }}
         - name: faas_nats_jetstream
           value: "true"
         {{- end }}

chart/openfaas/templates/jetstream-queueworker-dep.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.async (eq .Values.nats.queueMode "jetstream") }}
+{{- if and .Values.async (eq .Values.queueMode "jetstream") }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

chart/openfaas/templates/nats-dep.yaml

@@ -29,7 +29,7 @@ spec:
       - name:  nats
         resources:
           {{- .Values.nats.resources | toYaml | nindent 12 }}
-        {{- if eq .Values.nats.queueMode "jetstream" }}
+        {{- if eq .Values.queueMode "jetstream" }}
         image: {{ .Values.nats.image }}
         {{- else }}
         image: {{ .Values.stan.image }}
@@ -42,11 +42,11 @@ spec:
         - containerPort: 8222
           protocol: TCP
         {{- end }}
-        {{- if not (eq .Values.nats.queueMode "jetstream") }}
+        {{- if not (eq .Values.queueMode "jetstream") }}
         command: ["/nats-streaming-server"]
         {{- end }}
         args:
-          {{- if eq .Values.nats.queueMode "jetstream" }}
+          {{- if eq .Values.queueMode "jetstream" }}
           - --js
           {{- else}}
           - --store
@@ -72,7 +72,7 @@ spec:
         - -routez
         - -subz
         - -varz
-        {{- if eq .Values.nats.queueMode "jetstream" }}
+        {{- if eq .Values.queueMode "jetstream" }}
         - -jsz=all
         {{- else }}
         - -channelz

chart/openfaas/templates/queueworker-dep.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.async (not (eq .Values.nats.queueMode "jetstream")) }}
+{{- if and .Values.async (not (eq .Values.queueMode "jetstream")) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

chart/openfaas/values.yaml

@@ -16,6 +16,8 @@ exposeServices: true
 serviceType: NodePort        # serviceType for OpenFaaS gateway
 async: true                  # No known reason to disable this, kept for legacy reasons 
 
+queueMode: ""                # Set to `jetstream` to run the async system backed by NATS JetStream. By default the async system uses NATS Streaming 
+
 # Set to true to use legacy / community-edition auto-scaling
 # when openfaasPro is set to true to use the original 
 # auto-scaling logic
@@ -244,7 +246,6 @@ stan:
 # NATS is required for async
 nats:
   channel: "faas-request"
-  queueMode: ""
   # Stream replication is set to 1 by default. This is only recommended for development.
   # For production a value of at least 3 is recommended for NATS JetStream to be resilient.
   # See https://github.com/openfaas/openfaas-pro/blob/master/jetstream.md