From 0f4f8768f83b257d2a24045a737916bc0707b9d4 Mon Sep 17 00:00:00 2001 From: Eric Chlebek Date: Wed, 21 May 2025 16:05:30 -0700 Subject: [PATCH 1/3] otelcol: add statefulset affinity when specified Signed-off-by: Eric Chlebek --- .../helm/sumologic/templates/events/otelcol/statefulset.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml b/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml index aa293f626..ad65a8b48 100644 --- a/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml +++ b/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml @@ -49,6 +49,9 @@ spec: {{- if not (empty (include "otelcolInstrumentation.statefulset.affinity" .)) }} {{ include "otelcolInstrumentation.statefulset.affinity" . | indent 8 }} {{- end }} +{{- if not (empty (include "events.statefulset.affinity" .)) }} +{{ include "events.statefulset.affinity" . | indent 8 }} +{{- end }} {{- if eq .Values.otelevents.statefulset.podAntiAffinity "hard"}} {{ include "pod-anti-affinity-hard" . | indent 8 }} {{else if eq .Values.otelevents.statefulset.podAntiAffinity "soft"}} From 4a361271f8a0b7b47b5a86afe08210722166d4e2 Mon Sep 17 00:00:00 2001 From: Eric Chlebek Date: Thu, 22 May 2025 12:55:22 -0700 Subject: [PATCH 2/3] add changelog Signed-off-by: Eric Chlebek --- .changelog/3935.fixed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/3935.fixed.txt diff --git a/.changelog/3935.fixed.txt b/.changelog/3935.fixed.txt new file mode 100644 index 000000000..ab892e0f2 --- /dev/null +++ b/.changelog/3935.fixed.txt @@ -0,0 +1 @@ +fix: fix statefulset node affinity template inclusion From 059d51be6620ce064a8d46561ab208a43dc4f951 Mon Sep 17 00:00:00 2001 From: Eric Chlebek Date: Thu, 22 May 2025 12:55:35 -0700 Subject: [PATCH 3/3] remove buggy affinity inclusion Signed-off-by: Eric Chlebek --- .../helm/sumologic/templates/events/otelcol/statefulset.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml b/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml index ad65a8b48..412d490e5 100644 --- a/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml +++ b/deploy/helm/sumologic/templates/events/otelcol/statefulset.yaml @@ -46,9 +46,6 @@ spec: {{- end }} {{- if or (not (empty (include "events.statefulset.affinity" .))) .Values.otelevents.statefulset.podAntiAffinity }} affinity: -{{- if not (empty (include "otelcolInstrumentation.statefulset.affinity" .)) }} -{{ include "otelcolInstrumentation.statefulset.affinity" . | indent 8 }} -{{- end }} {{- if not (empty (include "events.statefulset.affinity" .)) }} {{ include "events.statefulset.affinity" . | indent 8 }} {{- end }}