Merge branch 'openfaas:master' into feat-add-startup-error-when-runni…

…ng-in-kube-system

chart/openfaas/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: OpenFaaS - Serverless Functions Made Simple
 name: openfaas
-version: 11.0.1
+version: 11.0.4
 sources:
 - https://github.com/openfaas/faas
 - https://github.com/openfaas/faas-netes

chart/openfaas/README.md

@@ -428,7 +428,9 @@ See [values.yaml](./values.yaml) for detailed configuration.
 | Parameter               | Description                           | Default                                                    |
 | ----------------------- | ----------------------------------    | ---------------------------------------------------------- |
 | `affinity`| Global [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) rules assigned to deployments | `{}` |
-| `async` | Enables asynchronous function invocations. If `.nats.external.enabled` is `false`, also deploys NATS Streaming | `true` |
+yaml) |
+| `async` | Enables asynchronous function invocations. If `.nats.external.enabled` is `false`, also deploys NATS | `true` |
+| `queueMode` | Set to `jetstream` to run the async system backed by NATS JetStream. By default the async system uses NATS Streaming|
 | `basic_auth` | Enable basic authentication on the gateway and Prometheus. Warning: do not disable. | `true` |
 | `basicAuthPlugin.image` | Container image used for basic-auth-plugin | See [values.yaml](./values.yaml) |
 | `basicAuthPlugin.replicas` | Replicas of the basic-auth-plugin | `1` |
@@ -509,7 +511,11 @@ See [values.yaml](./values.yaml) for detailed configuration.
 
 | Parameter               | Description                           | Default                                                    |
 | ----------------------- | ----------------------------------    | ---------------------------------------------------------- |
-| `nats.channel` | The name of the NATS Streaming channel to use for asynchronous function invocations | `faas-request` |
+| `jetstreamQueueWorker.durableName` | Durable name used by JetStream consumers | `faas-workers` |
+| `jetstreamQueueWorker.image` | Container image used for the queue-worker when the `queueMode` is `jetstream` | See [values.yaml](./values.yaml) |
+| `jetstreamQueueWorker.logs.debug` | Log debug messages | `false` |
+| `jetstreamQueueWorker.logs.format` | Set the log format, supports `console` or `json` | `console` |
+| `nats.channel` | The name of the NATS Streaming channel or NATS JetStream stream to use for asynchronous function invocations | `faas-request` |
 | `nats.enableMonitoring` | Enable the NATS monitoring endpoints on port `8222` for NATS Streaming deployments managed by this chart | `false` |
 | `nats.external.clusterName` | The name of the externally-managed NATS Streaming server | `""` |
 | `nats.external.enabled` | Whether to use an externally-managed NATS Streaming server | `false` |
@@ -519,6 +525,7 @@ See [values.yaml](./values.yaml) for detailed configuration.
 | `nats.metrics.enabled` | Export Prometheus metrics for NATS, no multi-arch support  | `false` |
 | `nats.metrics.image` | Container image used for the NATS Prometheus exporter | See [values.yaml](./values.yaml) |
 | `nats.resources` | Resource limits and requests for the nats pods | See [values.yaml](./values.yaml) |
+| `nats.streamReplication` | JetStream stream replication factor. For production a value of at least 3 is recommended. | `1` |
 | `queueWorker.ackWait` | Max duration of any async task/request | `60s` |
 | `queueWorker.image` | Container image used for the CE edition of the queue-worker| See [values.yaml](./values.yaml) |
 | `queueWorker.maxInflight` | Control the concurrent invocations | `1` |
@@ -533,6 +540,7 @@ See [values.yaml](./values.yaml) for detailed configuration.
 | `queueWorkerPro.maxRetryWait` | Maximum amount of time to wait between retries | `120s` |
 | `queueWorkerPro.printResponseBody` | Print the function response body | `false` |
 | `queueWorkerPro.printRequestBody` | Print the request body| `false` |
+| `stan.image` | Container image used for NATS streaming server | See [values.yaml](./values.yaml) | 
 
 ### Dashboard (OpenFaaS Pro)
 

chart/openfaas/values-pro.yaml

@@ -46,5 +46,11 @@ queueWorker:
 # https://www.openfaas.com/blog/jetstream-for-openfaas/
 queueMode: jetstream
 
+# Set stream replication factor.
+# 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
+nats:
+  streamReplication: 3
+
  # For timeouts longer than 60 seconds see:
  # https://docs.openfaas.com/tutorials/expanded-timeouts/

chart/openfaas/values.yaml

@@ -105,10 +105,10 @@ oidcAuthPlugin:
   securityContext: true
 
 gatewayPro:
-  image: ghcr.io/openfaasltd/gateway:0.2.2
+  image: ghcr.io/openfaasltd/gateway:0.2.4
 
 gateway:
-  image: ghcr.io/openfaas/gateway:0.25.1
+  image: ghcr.io/openfaas/gateway:0.25.2
   readTimeout: "65s"
   writeTimeout: "65s"
   upstreamTimeout: "60s"  # Must be smaller than read/write_timeout
@@ -135,18 +135,18 @@ gateway:
       cpu: "50m"
 
 basicAuthPlugin:
-  image: ghcr.io/openfaas/basic-auth:0.25.1
+  image: ghcr.io/openfaas/basic-auth:0.25.2
   replicas: 1
   resources:
     requests:
       memory: "50Mi"
       cpu: "20m"
 
 faasnetesPro:
-  image: ghcr.io/openfaasltd/faas-netes:0.1.7
+  image: ghcr.io/openfaasltd/faas-netes:0.1.9
 
 operatorPro:
-  image: ghcr.io/openfaasltd/faas-netes:0.1.7
+  image: ghcr.io/openfaasltd/faas-netes:0.1.9
 
 faasnetes:
   image: ghcr.io/openfaas/faas-netes:0.15.2
@@ -180,7 +180,7 @@ operator:
 #  
 # Enable automatically when nats.queueMode is set to "jetstream"
 jetstreamQueueWorker:
-  image: ghcr.io/openfaasltd/jetstream-queue-worker:0.2.0
+  image: ghcr.io/openfaasltd/jetstream-queue-worker:0.2.1
   durableName: "faas-workers"
   logs:
     debug: false
@@ -241,7 +241,7 @@ alertmanager:
 
 stan:
   # Image used for nats deployment when using async with NATS-Streaming.
-  image: nats-streaming:0.22.0
+  image: nats-streaming:0.24.6
 
 # NATS is required for async
 nats: