From 7432d611f9ffde7020f3175e3e1fda81ea9e8f0b Mon Sep 17 00:00:00 2001
From: "Alessandro (Ale) Segala" <43508+ItalyPaleAle@users.noreply.github.com>
Date: Thu, 16 Nov 2023 04:16:48 -0800
Subject: [PATCH] Fix: Using `deploymentAnnotations` produces invalid Helm
 chart (#7194)

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Co-authored-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>
---
 .../dapr_operator/templates/dapr_operator_deployment.yaml     | 4 ++--
 .../dapr_placement/templates/dapr_placement_statefulset.yaml  | 4 ++--
 .../charts/dapr_sentry/templates/dapr_sentry_deployment.yaml  | 4 ++--
 .../templates/dapr_sidecar_injector_deployment.yaml           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml b/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml
index 81c7434c10c..dd1b81ce074 100644
--- a/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml
+++ b/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml
@@ -34,8 +34,8 @@ spec:
         prometheus.io/port: "{{ .Values.global.prometheus.port }}"
         prometheus.io/path: "/"
 {{- end }}
-{{- if .Values.deploymentAnnotations }}
-{{ toYaml .Values.deploymentAnnotations | indent 4}}
+{{- with .Values.deploymentAnnotations }}
+{{ toYaml . | indent 8 }}
 {{- end }}
     spec:
       containers:
diff --git a/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml b/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml
index 9336d0108aa..3e9b7c3518a 100644
--- a/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml
+++ b/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml
@@ -37,8 +37,8 @@ spec:
         prometheus.io/port: "{{ .Values.global.prometheus.port }}"
         prometheus.io/path: "/"
 {{- end }}
-{{- if .Values.statefulsetAnnotations }}
-{{ toYaml .Values.statefulsetAnnotations | indent 4}}
+{{- with .Values.statefulsetAnnotations }}
+{{ toYaml . | indent 8 }}
 {{- end }}
     spec:
       containers:
diff --git a/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml b/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml
index 7637e686a2a..a191e79e370 100644
--- a/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml
+++ b/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml
@@ -65,8 +65,8 @@ spec:
         prometheus.io/port: "{{ .Values.global.prometheus.port }}"
         prometheus.io/path: "/"
 {{- end }}
-{{- if .Values.deploymentAnnotations }}
-{{ toYaml .Values.deploymentAnnotations | indent 4}}
+{{- with .Values.deploymentAnnotations }}
+{{ toYaml . | indent 8 }}
 {{- end }}
     spec:
       containers:
diff --git a/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml b/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
index 1c8ca573800..8b3cbd3c56c 100644
--- a/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
+++ b/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
@@ -35,8 +35,8 @@ spec:
         prometheus.io/port: "{{ .Values.global.prometheus.port }}"
         prometheus.io/path: "/"
 {{- end }}
-{{- if .Values.deploymentAnnotations }}
-{{ toYaml .Values.deploymentAnnotations | indent 4}}
+{{- with .Values.deploymentAnnotations }}
+{{ toYaml . | indent 8 }}
 {{- end }}
     spec:
       {{- if .Values.hostNetwork }}