From d22bbe541e38a4faa73c1873c70f2fa6eb4c387d Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:02:39 +0100 Subject: [PATCH] feat(otellogs): support tolerations, nodeSelector and affinity for daemonset (#2158) * feat(otellogs): support tolerations, nodeSelector and affinity for daemonset Signed-off-by: Dominik Rosiek * docs(changelog): update Signed-off-by: Dominik Rosiek --- CHANGELOG.md | 2 ++ .../templates/logs/collector/otelcol/daemonset.yaml | 12 ++++++++++++ deploy/helm/sumologic/values.yaml | 3 +++ 3 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20e91215ee..490823c293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat(metrics): drop container label for non-container kube state metrics [#2144][#2144] - feat(fluent-bit): drop all capabilities for container [#2151][#2151] - feat: allow to collect logs from /var/log/pods and add instruction how to do it [#2153][#2153] [#2156][#2156] +- feat(otellogs): support tolerations, nodeSelector and affinity for daemonset [#2158][#2158] ### Fixed @@ -35,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2151]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2151 [#2153]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2153 [#2156]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2156 +[#2158]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2158 ## [v2.5.2] diff --git a/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml b/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml index 9bd9b06cf8..081c072a71 100644 --- a/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml +++ b/deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml @@ -30,6 +30,18 @@ spec: {{ toYaml .Values.otellogs.daemonset.podLabels | indent 8 }} {{- end }} spec: +{{- if .Values.otellogs.daemonset.nodeSelector }} + nodeSelector: +{{ toYaml .Values.otellogs.daemonset.nodeSelector | indent 8 }} +{{- end }} +{{- if or .Values.otellogs.daemonset.affinity }} + affinity: +{{ toYaml .Values.otellogs.daemonset.affinity | indent 8 }} +{{- end }} +{{- if .Values.otellogs.daemonset.tolerations }} + tolerations: +{{ toYaml .Values.otellogs.daemonset.tolerations | indent 8 }} +{{- end }} securityContext: {{- toYaml .Values.otellogs.daemonset.securityContext | nindent 8 }} {{- if .Values.otellogs.daemonset.priorityClassName }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index e3d2adfaa1..a6958222b2 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -4653,6 +4653,9 @@ otellogs: otelcol: securityContext: {} + nodeSelector: {} + tolerations: [] + affinity: {} ## Configure telegraf-operator ## ref: https://github.com/influxdata/helm-charts/blob/master/charts/telegraf-operator/values.yaml