Skip to content

Commit

Permalink
Merge pull request #18 from AndreZiviani/ignore-noschedule
Browse files Browse the repository at this point in the history
tolerate taint NoSchedule by default
  • Loading branch information
AndreZiviani authored May 27, 2021
2 parents 50cdd9e + 58ab219 commit a901aa0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion charts/grafana-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: grafana-agent
description: Grafana Agent is a telemetry collector for sending metrics, logs, and trace data to the opinionated Grafana observability stack.
type: application
appVersion: v0.14.0
version: 1.0.15
version: 1.0.16
home: https://github.com/grafana/agent/
sources:
- https://grafana.com/docs/grafana-cloud/agent/
Expand Down
4 changes: 2 additions & 2 deletions charts/grafana-agent/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# grafana-agent

![Version: 1.0.15](https://img.shields.io/badge/Version-1.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)
![Version: 1.0.16](https://img.shields.io/badge/Version-1.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)

This chart is a temporary solution while the [Operator is not finished](https://github.com/grafana/agent/pull/549),
after that this chart will be discontinued.
Expand Down Expand Up @@ -80,7 +80,7 @@ A major chart version change indicates that there is an incompatible breaking ch
| tempo.remoteWriteURL | string | `"http://localhost"` | |
| tempo.strategies | string | `"{\"default_strategy\": {\"param\": 0.001, \"type\": \"probabilistic\"}}\n"` | Jaeger strategy |
| tempo.tenant | string | `""` | Add the X-Scope-OrgID header to the requests, usefull when using multitenant tempo feature |
| tolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for pods. By default, pods will be scheduled on master nodes. |
| tolerations | list | `[{"effect":"NoSchedule","operator":"Exists"}]` | Tolerations for pods |
| updateStrategy | object | `{"type":"RollingUpdate"}` | The update strategy for the DaemonSet |

## Configuration
Expand Down
5 changes: 2 additions & 3 deletions charts/grafana-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,10 @@ nodeSelector: {}
# -- Affinity configuration for pods
affinity: {}

# -- Tolerations for pods. By default, pods will be scheduled on master nodes.
# -- Tolerations for pods
tolerations:
- key: node-role.kubernetes.io/master
- effect: NoSchedule
operator: Exists
effect: NoSchedule

# -- Default volumes that are mounted into pods. In most cases, these should not be changed.
# Use `extraVolumes`/`extraVolumeMounts` for additional custom volumes.
Expand Down

0 comments on commit a901aa0

Please sign in to comment.