From f07694038d54c37d2d7cc95d95da358b2443569f Mon Sep 17 00:00:00 2001 From: Jacques-olivier Dordonne Date: Tue, 6 May 2025 12:08:19 -0400 Subject: [PATCH 1/3] [fix] Pod disruption budget selector label for logzio-telemetry --- charts/logzio-telemetry/templates/_helpers.tpl | 7 +++++++ .../templates/poddisruptionbudget-spm.yaml | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml diff --git a/charts/logzio-telemetry/templates/_helpers.tpl b/charts/logzio-telemetry/templates/_helpers.tpl index f4279302..a3a4c2bc 100644 --- a/charts/logzio-telemetry/templates/_helpers.tpl +++ b/charts/logzio-telemetry/templates/_helpers.tpl @@ -94,6 +94,13 @@ app.kubernetes.io/name: {{ include "opentelemetry-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} +{{- define "opentelemetry-collector-spm.selectorLabels" -}} +app.kubernetes.io/name: {{ include "opentelemetry-collector.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +component: standalone-collector-spm +{{- end }} + + {{/* Create the name of the service account to use */}} diff --git a/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml b/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml new file mode 100644 index 00000000..11b23dce --- /dev/null +++ b/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml @@ -0,0 +1,18 @@ +{{- if .Values.podDisruptionBudget.enabled }} +apiVersion: policy/v1 +kind: PodDisruptionBudget +metadata: + name: {{ include "opentelemetry-collector.fullname" . }} + labels: + {{- include "opentelemetry-collector.labels" . | nindent 4 }} +spec: + selector: + matchLabels: + {{- include "opentelemetry-collector-spm.selectorLabels" . | nindent 6 }} +{{- if .Values.podDisruptionBudget.maxUnavailable }} + maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }} +{{- end }} +{{- if and .Values.podDisruptionBudget.minAvailable (not .Values.podDisruptionBudget.maxUnavailable)}} + minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} +{{- end }} +{{- end }} \ No newline at end of file From 8891c7b5bc840099c3612c3dea57d09a04937834 Mon Sep 17 00:00:00 2001 From: Jacques-olivier Dordonne Date: Tue, 6 May 2025 13:35:36 -0400 Subject: [PATCH 2/3] [fix] Pod disruption budget selector label for logzio-telemetry --- charts/logzio-telemetry/templates/_helpers.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/logzio-telemetry/templates/_helpers.tpl b/charts/logzio-telemetry/templates/_helpers.tpl index a3a4c2bc..f8fa08b4 100644 --- a/charts/logzio-telemetry/templates/_helpers.tpl +++ b/charts/logzio-telemetry/templates/_helpers.tpl @@ -92,6 +92,7 @@ Selector labels {{- define "opentelemetry-collector.selectorLabels" -}} app.kubernetes.io/name: {{ include "opentelemetry-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +component: component: logzio-telemetry-collector {{- end }} {{- define "opentelemetry-collector-spm.selectorLabels" -}} From cae3edcb3507dea3838c21630ca7e63f97e2410b Mon Sep 17 00:00:00 2001 From: Jacques-olivier Dordonne Date: Tue, 6 May 2025 13:41:49 -0400 Subject: [PATCH 3/3] [fix] Pod disruption budget name for logzio-k8s-telemetry-otel-collector-spm --- charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml b/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml index 11b23dce..8a1e12d1 100644 --- a/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml +++ b/charts/logzio-telemetry/templates/poddisruptionbudget-spm.yaml @@ -2,7 +2,7 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: {{ include "opentelemetry-collector.fullname" . }} + name: {{ include "opentelemetry-spm.fullname" . }} labels: {{- include "opentelemetry-collector.labels" . | nindent 4 }} spec: