Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix helm chart requirements conditions #731

Merged
merged 6 commits into from
Jun 16, 2020
Merged

Fix helm chart requirements conditions #731

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbd5704
Fix helm chart requirements conditions
Jun 15, 2020
23352f7
Generate new overrides yaml/libsonnet file(s).
Jun 15, 2020
4908ebe
Update comments due to review
sumo-drosiek Jun 16, 2020
45ccafc
Generate new overrides yaml/libsonnet file(s).
Jun 16, 2020
344b610
Update comments due to review
sumo-drosiek Jun 16, 2020
e943094
Generate new overrides yaml/libsonnet file(s).
Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/helm/fluent-bit-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ resources: {}
# cpu: 10m
# memory: 8Mi

## Set the enabled flag to false to not install fluent-bit helm chart as a dependency along with this helm chart
# enabled: false
service:
flush: 5
metrics:
Expand Down
6 changes: 2 additions & 4 deletions deploy/helm/prometheus-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ nodeExporter:
interval:
# Ensure we use pre 1.14 recording rules consistently as current content depends on them.
kubeTargetVersionOverride: 1.13.0-0
## Set the enabled flag to false for either of the below two purposes:
## 1. Not install prometheus operator helm chart as a dependency along with this helm chart
## 2. Disable metrics collection altogether
enabled: true
## Set the enabled flag to false to not install prometheus operator helm chart as a dependency along with this helm chart
# enabled: false
alertmanager:
enabled: false
grafana:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ dependencies:
- name: fluent-bit
version: 2.8.14
repository: https://kubernetes-charts.storage.googleapis.com/
condition: sumologic.logs.enabled,fluent-bit.enabled
condition: fluent-bit.enabled,sumologic.logs.enabled
- name: prometheus-operator
version: 8.13.8
repository: https://kubernetes-charts.storage.googleapis.com/
condition: sumologic.metrics.enabled,prometheus-operator.enabled
condition: prometheus-operator.enabled,sumologic.metrics.enabled
- name: falco
version: 1.1.8
repository: https://falcosecurity.github.io/charts
Expand Down
9 changes: 4 additions & 5 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,8 @@ fluent-bit:
# cpu: 10m
# memory: 8Mi

enabled: true
## Set the enabled flag to false to not install fluent-bit helm chart as a dependency along with this helm chart
sumo-drosiek marked this conversation as resolved.
Show resolved Hide resolved
# enabled: false
service:
flush: 5
metrics:
Expand Down Expand Up @@ -765,10 +766,8 @@ prometheus-operator:
interval:
# Ensure we use pre 1.14 recording rules consistently as current content depends on them.
kubeTargetVersionOverride: 1.13.0-0
## Set the enabled flag to false for either of the below two purposes:
## 1. Not install prometheus operator helm chart as a dependency along with this helm chart
## 2. Disable metrics collection altogether
enabled: true
## Set the enabled flag to false to not install prometheus operator helm chart as a dependency along with this helm chart
sumo-drosiek marked this conversation as resolved.
Show resolved Hide resolved
# enabled: false
alertmanager:
enabled: false
grafana:
Expand Down