Addressed comments: added to all deployments and daemonsets & fixed s…

…pacing.
aws-observability · May 17, 2024 · 5a4d29b · 5a4d29b
1 parent 06c7108
commit 5a4d29b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 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
@@ -112,7 +112,6 @@ spec:
       fieldRef:
         fieldPath: metadata.namespace
   {{- with .Values.tolerations }}
-  tolerations:
-    {{- toYaml . | nindent 8 }}
+  tolerations: {{- toYaml . | nindent 2}}
   {{- end }}
 {{- end }}
diff --git 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
+      key_file: /etc/amazon-cloudwatch-observability-dcgm-cert/server.key
+  {{- with .Values.tolerations }}
+  tolerations: {{- toYaml . | nindent 2}}
+  {{- end }}
diff --git 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 }}
diff --git 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"
         }
       ]
-    }
+    }
+  {{- with .Values.tolerations }}
+  tolerations: {{- toYaml . | nindent 2}}
+  {{- end }}
diff --git 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 }}
diff --git a/...amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml b/...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 }}
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
@@ -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 }}