feat(metrics): add setting affinity for metrics collector

SumoLogic · Nov 14, 2023 · 9ae9e49 · 9ae9e49
1 parent a2eeb94
commit 9ae9e49
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/.changelog/3400.added.txt b/.changelog/3400.added.txt
@@ -0,0 +1 @@
+feat(metrics): add setting affinity for metrics collector
diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md
@@ -123,6 +123,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `sumologic.metrics.collector.otelcol.priorityClassName`                               | Priority class name for the experimental otelcol metrics.                                                                                                                                                                                                                                                  | `null`                                                                                                                                                                               |
 | `sumologic.metrics.collector.otelcol.securityContext`                                 | The securityContext configuration for the experimental otelcol metrics.                                                                                                                                                                                                                                    | `{"fsGroup": 999}`                                                                                                                                                                   |
 | `sumologic.metrics.collector.otelcol.tolerations`                                     | Tolerations for the experimental otelcol metrics.                                                                                                                                                                                                                                                          | `[]`                                                                                                                                                                                 |
+| `sumologic.metrics.collector.otelcol.affinity`                                        | Affinity for the otelcol metrics collector.                                                                                                                                                                                                                                                                | `{}`                                                                                                                                                                                 |
 | `sumologic.metrics.enableDefaultFilters`                                              | Enable default metric filters for Sumo Apps.                                                                                                                                                                                                                                                               | `false`                                                                                                                                                                              |
 | `sumologic.metrics.collector.otelcol.kubelet.enabled`                                 | Enable collection of kubelet metrics.                                                                                                                                                                                                                                                                      | `true`                                                                                                                                                                               |
 | `sumologic.metrics.collector.otelcol.cAdvisor.enabled`                                | Enable collection of cAdvisor metrics.                                                                                                                                                                                                                                                                     | `true`                                                                                                                                                                               |

diff --git a/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml b/deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml
@@ -58,6 +58,10 @@ spec:
   tolerations:
 {{ toYaml .Values.sumologic.metrics.collector.otelcol.tolerations | indent 4 }}
 {{- end }}
+{{- if .Values.sumologic.metrics.collector.otelcol.affinity }}
+  affinity:
+{{ toYaml .Values.sumologic.metrics.collector.otelcol.affinity | indent 4 }}
+{{- end }}
 {{- if .Values.sumologic.metrics.collector.otelcol.priorityClassName }}
   priorityClassName: {{ .Values.sumologic.metrics.collector.otelcol.priorityClassName | quote }}
 {{- end }}

diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -503,6 +503,8 @@ sumologic:
           fsGroup: 999
         tolerations: []
 
+        affinity: {}
+
         ## Configuration for kubelet metrics
         kubelet:
           enabled: true

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml
@@ -31,6 +31,15 @@ sumologic:
           - key: null
             operator: Exists
             effect: "NoSchedule"
+        affinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: topology.kubernetes.io/zone
+                    operator: In
+                    values:
+                      - sumo-east1
+                      - sumo-west1
         securityContext:
           fsGroup: 999
 

diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
@@ -39,6 +39,15 @@ spec:
     - effect: NoSchedule
       key: null
       operator: Exists
+  affinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: topology.kubernetes.io/zone
+              operator: In
+              values:
+                - sumo-east1
+                - sumo-west1
   priorityClassName: "customPriority"
   env:
     - name: METADATA_METRICS_SVC
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		feat(metrics): add setting affinity for metrics collector