Skip to content

Commit

Permalink
Fixes the format of the tolerations parameter (helm#22134)
Browse files Browse the repository at this point in the history
Fixes the format of the tolerations parameter. It was mistakenly set as a map, while Kubernetes expects an array.

Signed-off-by: Alexandre Gattiker <algattik@users.noreply.github.com>
  • Loading branch information
algattik authored and Ian Levesque committed Jul 13, 2020
1 parent c31f1a2 commit 06d8e56
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion stable/locust/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: locust
description: A modern load testing framework
version: 1.2.0
version: 1.2.1
appVersion: 0.9.0
maintainers:
- name: haugene
Expand Down
4 changes: 2 additions & 2 deletions stable/locust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ helm install -n locust-nymph --set master.config.target-host=http://site.example
| `extraEnvs` | List of extra Environment Variables | `[]` |
| `master.config.target-host` | locust target host | `http://site.example.com` |
| `master.nodeSelector` | k8s nodeselector | `{}` |
| `master.tolerations` | k8s tolerance | `{}` |
| `master.tolerations` | k8s tolerations | `[]` |
| `worker.config.locust-script`| locust script to run | `/locust-tasks/tasks.py` |
| `worker.config.configmapName`| configmap to mount locust scripts from | `empty, configmap is created from tasks folder in Chart` |
| `worker.replicaCount` | Number of workers to run | `2` |
| `worker.nodeSelector` | k8s nodeselector | `{}` |
| `worker.tolerations` | k8s tolerance | `{}` |
| `worker.tolerations` | k8s tolerations | `[]` |
| `worker.affinities` | k8s affinities | `{}` |

Specify parameters using `--set key=value[,key=value]` argument to `helm install`
Expand Down
4 changes: 2 additions & 2 deletions stable/locust/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ master:
memory: 128Mi
nodeSelector: {}
# kops.k8s.io/instancegroup: master
tolerations: {}
tolerations: []
# - key: "application"
# operator: "Equal"
# value: "api"
Expand All @@ -73,7 +73,7 @@ worker:
memory: 128Mi
nodeSelector: {}
# kops.k8s.io/instancegroup: worker
tolerations: {}
tolerations: []
# - key: "application"
# operator: "Equal"
# value: "api"
Expand Down

0 comments on commit 06d8e56

Please sign in to comment.