From 5a4d29b5e71f1f93ef33fa854152f3e853878e8d Mon Sep 17 00:00:00 2001
From: musa-asad <musaasad@amazon.com>
Date: Fri, 17 May 2024 01:07:53 -0400
Subject: [PATCH] Addressed comments: added to all deployments and daemonsets &
 fixed spacing.

---
 .../templates/linux/cloudwatch-agent-daemonset.yaml          | 3 +--
 .../templates/linux/dcgm-exporter-daemonset.yaml             | 5 ++++-
 .../templates/linux/fluent-bit-daemonset.yaml                | 3 +--
 .../templates/linux/neuron-monitor-daemonset.yaml            | 5 ++++-
 .../templates/operator-deployment.yaml                       | 3 +++
 .../windows/cloudwatch-agent-windows-daemonset.yaml          | 3 +--
 .../templates/windows/fluent-bit-windows-daemonset.yaml      | 3 +--
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-daemonset.yaml
index 4ccc312..84b26b7 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-daemonset.yaml
@@ -112,7 +112,6 @@ spec:
       fieldRef:
         fieldPath: metadata.namespace
   {{- with .Values.tolerations }}
-  tolerations:
-    {{- toYaml . | nindent 8 }}
+  tolerations: {{- toYaml . | nindent 2}}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml
index a92fbbd..82ce49c 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml
@@ -70,4 +70,7 @@ spec:
   tlsConfig: |
     tls_server_config:
       cert_file: /etc/amazon-cloudwatch-observability-dcgm-cert/server.crt
-      key_file: /etc/amazon-cloudwatch-observability-dcgm-cert/server.key
\ No newline at end of file
+      key_file: /etc/amazon-cloudwatch-observability-dcgm-cert/server.key
+  {{- with .Values.tolerations }}
+  tolerations: {{- toYaml . | nindent 2}}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/linux/fluent-bit-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/fluent-bit-daemonset.yaml
index 672b187..ed8a8d9 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/fluent-bit-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/fluent-bit-daemonset.yaml
@@ -98,7 +98,6 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
       {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
+      tolerations: {{- toYaml . | nindent 6}}
       {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
index 5bc1824..3213648 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
@@ -90,4 +90,7 @@ spec:
           "type": "neuron_hw_counters"
         }
       ]
-    }
\ No newline at end of file
+    }
+  {{- with .Values.tolerations }}
+  tolerations: {{- toYaml . | nindent 2}}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml
index 073d3f2..9362df6 100644
--- a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml
@@ -51,3 +51,6 @@ spec:
           secretName: {{ template "amazon-cloudwatch-observability.certificateSecretName" . }}
       nodeSelector:
         kubernetes.io/os: linux
+      {{- with .Values.tolerations }}
+      tolerations: {{- toYaml . | nindent 6}}
+      {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml
index c0d5299..f801bbb 100644
--- a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml
@@ -48,7 +48,6 @@ spec:
   - name: RUN_AS_HOST_PROCESS_CONTAINER
     value: "True"
   {{- with .Values.tolerations }}
-  tolerations:
-    {{- toYaml . | nindent 8 }}
+  tolerations: {{- toYaml . | nindent 2}}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/amazon-cloudwatch-observability/templates/windows/fluent-bit-windows-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/windows/fluent-bit-windows-daemonset.yaml
index 3a51140..83adc0a 100644
--- a/charts/amazon-cloudwatch-observability/templates/windows/fluent-bit-windows-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/windows/fluent-bit-windows-daemonset.yaml
@@ -71,7 +71,6 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: {{ template "cloudwatch-agent.serviceAccountName" . }}
       {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
+      tolerations: {{- toYaml . | nindent 6}}
       {{- end }}
 {{- end }}
\ No newline at end of file