Skip to content

Commit 87eca61

Browse files
committed
Revert queueName default value in chart
Since queueName is a new field in the chart, it should not have a default. This will cause issues for users upgrading. When queueName is not set, it will use the stream name for the queue instead. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent 1f71432 commit 87eca61

17 files changed

+360
-345
lines changed

chart/queue-worker/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: queue-worker
33
description: Dedicated queue-worker for OpenFaaS using JetStream
44
type: application
5-
version: 0.2.17
5+
version: 0.2.18
66
keywords:
77
- openfaas
88
- jetstream

chart/queue-worker/README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,25 @@ helm upgrade --install \
1717
slow-fns openfaas/queue-worker \
1818
--namespace openfaas \
1919
--set maxInflight=5 \
20-
--set queueName=slow-fns \
2120
--set mode=static \
22-
--set nats.stream.name=slow-fns-requests \
21+
--set nats.stream.name=slow-fns \
2322
--set nats.consumer.durableName=slow-fns-workers \
2423
--set upstreamTimeout=15m
2524
```
2625

2726
It's recommended to take the NAME of the queue i.e. `slow-fns` and then use it as prefix in the following way for the above configuration:
2827

29-
* `queueName` - NAME
3028
* `nats.stream.name` - NAME`-requests`
3129
* `nats.consumer.durableName` - NAME`-workers`
3230

3331
As an alternative to using `--set`, you could also write your own YAML file. Below is the equivalent configuration in a values.yaml file, for instance `values-slow-fns.yaml`:
3432

3533
```yaml
3634
maxInflight: 5
37-
queueName: slow-fns
3835
mode: static
3936
nats:
4037
stream:
41-
name: slow-fns-requests
38+
name: slow-fns
4239
consumer:
4340
durableName: slow-fns-workers
4441
upstreamTimeout: 15m
@@ -89,9 +86,8 @@ helm upgrade --install \
8986
slow-fns ./ \
9087
--namespace openfaas \
9188
--set maxInflight=5 \
92-
--set queueName=slow-fns \
9389
--set mode=static \
94-
--set nats.stream.name=slow-fns-requests \
90+
--set nats.stream.name=slow-fns \
9591
--set nats.consumer.durableName=slow-fns-workers \
9692
--set upstreamTimeout=15m
9793
```
@@ -102,7 +98,7 @@ helm upgrade --install \
10298
|-----------|-------------|---------|
10399
| `image` | The queue-worker image that should be deployed | See values.yaml |
104100
| `replicas` | Number of queue-worker replicas to create | `1` |
105-
| `queueName` | Name of the queue | `faas-request` |
101+
| `queueName` | Name of the queue if you want it to be different to the stream name | `""` - when empty, defaults to `nats.stream.name` |
106102
| `mode` | Queue operation mode: `static` (OpenFaaS Standard) or `function` (requires OpenFaaS for Enterprises) | `static` |
107103
| `maxInflight` | Control the concurrent invocations | `1` |
108104
| `queuePartitions` | Number of queue partitions | `1` |

chart/queue-worker/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ replicas: 1
1010

1111
# Change this to your queue name.
1212
# Allowed characters (a - z), (0 - 9), - and _
13-
queueName: "custom-request"
13+
queueName: ""
1414
mode: static
1515
maxInflight: 1
1616

@@ -43,10 +43,10 @@ nats:
4343
host: "nats.openfaas"
4444
port: "4222"
4545
stream:
46-
name: "faas-request"
46+
name: "custom-request"
4747
replicas: 1
4848
consumer:
49-
durableName: "faas-workers"
49+
durableName: "custom-workers"
5050
ackWait: "30s"
5151

5252
logs:

docs/cron-connector-0.6.14.tgz

-1 Bytes
Binary file not shown.
-2 Bytes
Binary file not shown.

docs/headroom-controller-0.1.2.tgz

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)