adding component level affinity and node selectors

aws-observability · Feb 26, 2025 · 210305c · 210305c
1 parent bcacaf3
commit 210305c
Show file tree

Hide file tree

Showing 6 changed files with 235 additions and 207 deletions.
diff --git a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
@@ -61,19 +61,14 @@ spec:
   image: {{ template "cloudwatch-agent.image" (merge $agent.image (dict "region" $.Values.region)) }}
   mode: {{ $agent.mode }}
   replicas: {{ $agent.replicas }}
-  nodeSelector:
-    kubernetes.io/os: linux
+  {{- with $agent.nodeSelector }}
+  nodeSelector: {{- toYaml . | nindent 2 }}
+  {{- end }}
   serviceAccount: {{ $agent.serviceAccount.name | default (include "cloudwatch-agent.serviceAccountName" $) }}
   priorityClassName: {{ $agent.priorityClassName | default $.Values.agent.priorityClassName }}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: {{ $.Values.fargateLabelKey }}
-                operator: NotIn
-                values:
-                  - fargate
+  {{- with $agent.affinity }}
+  affinity: {{- toYaml . | nindent 2 }}
+  {{- end }}
   hostNetwork: true
   {{- if $agent.config }}
   config: {{ include "cloudwatch-agent.modify-config" (merge (dict "Config" $agent.config) $ ) }}

diff --git a/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/dcgm-exporter-daemonset.yaml
@@ -8,21 +8,13 @@ metadata:
     version: v1
 spec:
   image: {{ template "dcgm-exporter.image" . }}
-  nodeSelector:
-    kubernetes.io/os: linux
+  {{- with .Values.dcgmExporter.nodeSelector }}
+  nodeSelector: {{- toYaml . | nindent 2 }}
+  {{- end }}
   serviceAccount: {{ template "dcgm-exporter.serviceAccountName" . }}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: {{ .Values.nodeLabelKey }}
-                operator: In
-                values: {{ .Values.gpuInstances | toYaml | nindent 16 }}
-              - key: {{ .Values.fargateLabelKey }}
-                operator: NotIn
-                values:
-                  - fargate
+  {{- with .Values.dcgmExporter.affinity }}
+  affinity: {{- toYaml . | nindent 2 }}
+  {{- end }}
   {{- with .Values.dcgmExporter.resources }}
   resources: {{- toYaml . | nindent 4}}
   {{- 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
@@ -112,17 +112,12 @@ spec:
             - key: ca.crt
               path: tls-ca.crt
       serviceAccountName: {{ template "cloudwatch-agent.serviceAccountName" . }}
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: {{ .Values.fargateLabelKey }}
-                    operator: NotIn
-                    values:
-                      - fargate
-      nodeSelector:
-        kubernetes.io/os: linux
+      {{- with .Values.containerLogs.fluentBit.affinity }}
+      affinity: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.containerLogs.fluentBit.nodeSelector }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations: {{- toYaml . | nindent 6}}
       {{- 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
@@ -9,22 +9,12 @@ metadata:
 spec:
   image: {{ template "neuron-monitor.image" . }}
   serviceAccount: {{ template "neuron-monitor.serviceAccountName" . }}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: kubernetes.io/os
-                operator: In
-                values:
-                  - linux
-              - key: {{ .Values.nodeLabelKey }}
-                operator: In
-                values: {{ .Values.neuronInstances | toYaml | nindent 20 }}
-              - key: {{ .Values.fargateLabelKey }}
-                operator: NotIn
-                values:
-                  - fargate
+  {{- with .Values.neuronMonitor.nodeSelector }}
+  nodeSelector: {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.neuronMonitor.affinity }}
+  affinity: {{- toYaml . | nindent 2 }}
+  {{- end }}
   {{- with .Values.neuronMonitor.resources }}
   resources: {{- toYaml . | nindent 4}}
   {{- end }}

diff --git a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml
@@ -46,12 +46,16 @@ spec:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: cert
           readOnly: true
+      {{- with .Values.manager.affinity }}
+      affinity: {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ template "amazon-cloudwatch-observability.managerServiceAccountName" . }}
       terminationGracePeriodSeconds: 10
       volumes:
       - name: cert
         secret:
           defaultMode: 420
           secretName: {{ template "amazon-cloudwatch-observability.certificateSecretName" . }}
-      nodeSelector:
-        kubernetes.io/os: linux
+      {{- with .Values.manager.nodeSelector }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
+      {{- end }}