From fd24a78c4beb0c0709e41c248bfe2f1d77eaf10e Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Tue, 24 May 2022 14:19:02 +0200 Subject: [PATCH] fix(otellogs): set resources on Otelcol logs collector daemonset The resources were already defined in `values.yaml` in the `otellogs.daemonset.resources` property, but this property was not being used in the daemonset template. --- CHANGELOG.md | 5 +++++ .../templates/logs/collector/otelcol/daemonset.yaml | 2 ++ tests/helm/logs_otc_daemonset/static/basic.output.yaml | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 116441ca7e..7c14188fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - chore(deps): upgrade fluentd to 1.14.6-sumo-3 [#2287][#2287] +### Fixed + +- fix(otellogs): set resources on Otelcol logs collector daemonset [#2291] + [#2287]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2287 +[#2291]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2291 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.8.0...release-v2.8 ## [v2.8.0] diff --git a/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml b/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml index d21d74bef2..c18b4ffa34 100644 --- a/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml +++ b/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml @@ -64,6 +64,8 @@ spec: httpGet: path: / port: 13133 # Health Check extension default port. + resources: + {{- toYaml .Values.otellogs.daemonset.resources | nindent 10 }} volumeMounts: - mountPath: /etc/otelcol name: otelcol-config diff --git a/tests/helm/logs_otc_daemonset/static/basic.output.yaml b/tests/helm/logs_otc_daemonset/static/basic.output.yaml index 248953efd8..7f42917a1e 100644 --- a/tests/helm/logs_otc_daemonset/static/basic.output.yaml +++ b/tests/helm/logs_otc_daemonset/static/basic.output.yaml @@ -41,6 +41,13 @@ spec: httpGet: path: / port: 13133 # Health Check extension default port. + resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 100m + memory: 32Mi volumeMounts: - mountPath: /etc/otelcol name: otelcol-config