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

Expose setting resource constraints for helm dependencies #464

Merged
merged 2 commits into from
Mar 6, 2020
Merged

Expose setting resource constraints for helm dependencies #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c5e07
expose setting resource constraints for fluentbit, prometheus, promet…
vsinghal13 Mar 4, 2020
3b5d8f8
Generate new overrides yaml/libsonnet file(s).
Mar 5, 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
9 changes: 9 additions & 0 deletions deploy/helm/fluent-bit-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# This file is auto-generated.
## Resource limits for fluent-bit
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 10m
# memory: 8Mi

service:
flush: 5
metrics:
Expand Down
6 changes: 6 additions & 0 deletions deploy/helm/prometheus-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ grafana:
enabled: false
defaultDashboardsEnabled: false
prometheusOperator:
## Resource limits for prometheus operator
resources: {}
admissionWebhooks:
enabled: false
tlsProxy:
Expand Down Expand Up @@ -60,6 +62,10 @@ prometheus:
matchLabels:
app: collection-sumologic-otelcol
prometheusSpec:
## Define resources requests and limits for single Pods.
resources: {}
# requests:
# memory: 400Mi
thanos:
version: v0.10.0
containers:
Expand Down
15 changes: 15 additions & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,15 @@ metrics-server:
## Configure fluent-bit
## ref: https://github.com/helm/charts/blob/master/stable/fluent-bit/values.yaml
fluent-bit:
## Resource limits for fluent-bit
resources: {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe prometheus operator does not have default resource limits defined, can we confirm whether fluent-bit has any default resource limits? otherwise this would be overriding the defined defaults

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no default limits for 2.8.1 version: https://github.com/helm/charts/blob/866c1da688dc13d176a9b251ff4636a162c6a735/stable/fluent-bit/values.yaml#L187

# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 10m
# memory: 8Mi

enabled: true
service:
flush: 5
Expand Down Expand Up @@ -466,6 +475,8 @@ prometheus-operator:
enabled: false
defaultDashboardsEnabled: false
prometheusOperator:
## Resource limits for prometheus operator
resources: {}
admissionWebhooks:
enabled: false
tlsProxy:
Expand Down Expand Up @@ -518,6 +529,10 @@ prometheus-operator:
matchLabels:
app: collection-sumologic-otelcol
prometheusSpec:
## Define resources requests and limits for single Pods.
resources: {}
# requests:
# memory: 400Mi
thanos:
version: v0.10.0
containers:
Expand Down