From fffe770ecb33d2c5501344ac9810d5c68648fa44 Mon Sep 17 00:00:00 2001 From: pinkneyj Date: Fri, 3 Jul 2026 12:02:28 +0100 Subject: [PATCH 1/3] update affinity on server and aggregator to be automatically set --- helm/templates/agent-deploy.yaml | 4 +++- helm/templates/aggregator-deploy.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/helm/templates/agent-deploy.yaml b/helm/templates/agent-deploy.yaml index 59ec7c3a..f748b59e 100644 --- a/helm/templates/agent-deploy.yaml +++ b/helm/templates/agent-deploy.yaml @@ -347,7 +347,9 @@ spec: {{- include "cloudzero-agent.generateImagePullSecrets" (dict "root" . "image" .Values.components.prometheus.image) | nindent 6 }} {{- include "cloudzero-agent.generateNodeSelector" (dict "default" .Values.defaults.nodeSelector "nodeSelector" .Values.server.nodeSelector) | nindent 6 }} {{- include "cloudzero-agent.generateTolerations" (concat .Values.defaults.tolerations .Values.server.tolerations) | nindent 6 }} - {{- include "cloudzero-agent.generateAffinity" (dict "default" .Values.defaults.affinity "affinity" .Values.server.affinity) | nindent 6 }} + {{- $podAntiAffinity := dict "podAntiAffinity" (dict "preferredDuringSchedulingIgnoredDuringExecution" (list (dict "weight" 100 "podAffinityTerm" (dict "labelSelector" (dict "matchLabels" (dict "app.kubernetes.io/name" "server")) "topologyKey" "kubernetes.io/hostname")))) }} + {{- $userAffinity := deepCopy (.Values.server.affinity | default (dict)) }} + {{- include "cloudzero-agent.generateAffinity" (dict "default" .Values.defaults.affinity "affinity" (merge $userAffinity $podAntiAffinity)) | nindent 6 }} {{- with .Values.server.topologySpreadConstraints }} topologySpreadConstraints: {{- toYaml . | nindent 8 }} diff --git a/helm/templates/aggregator-deploy.yaml b/helm/templates/aggregator-deploy.yaml index 4edf7b43..e4411741 100644 --- a/helm/templates/aggregator-deploy.yaml +++ b/helm/templates/aggregator-deploy.yaml @@ -177,7 +177,9 @@ spec: {{- include "cloudzero-agent.generateDNSInfo" (dict "defaults" .Values.defaults.dns) | nindent 6 }} {{- include "cloudzero-agent.generateImagePullSecrets" (dict "root" . "image" .Values.components.agent.image) | nindent 6 }} {{- include "cloudzero-agent.generateNodeSelector" (dict "default" .Values.defaults.nodeSelector "nodeSelector" .Values.aggregator.nodeSelector) | nindent 6 }} - {{- include "cloudzero-agent.generateAffinity" (dict "default" .Values.defaults.affinity "affinity" .Values.aggregator.affinity) | nindent 6 }} + {{- $podAntiAffinity := dict "podAntiAffinity" (dict "preferredDuringSchedulingIgnoredDuringExecution" (list (dict "weight" 100 "podAffinityTerm" (dict "labelSelector" (dict "matchLabels" (dict "app.kubernetes.io/name" "aggregator")) "topologyKey" "kubernetes.io/hostname")))) }} + {{- $userAffinity := deepCopy (.Values.aggregator.affinity | default (dict)) }} + {{- include "cloudzero-agent.generateAffinity" (dict "default" .Values.defaults.affinity "affinity" (merge $userAffinity $podAntiAffinity)) | nindent 6 }} {{- include "cloudzero-agent.generateTolerations" (concat .Values.defaults.tolerations) | nindent 6 }} {{- with .Values.server.topologySpreadConstraints }} From 94043df139bf275a44e0a263f84177c77c30dd9e Mon Sep 17 00:00:00 2001 From: pinkneyj Date: Wed, 5 Aug 2026 14:31:09 +0100 Subject: [PATCH 2/3] push change for greptile pickup --- helm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/README.md b/helm/README.md index 3f840d03..4ea8eaeb 100644 --- a/helm/README.md +++ b/helm/README.md @@ -6,7 +6,7 @@ A Helm chart for deploying a metrics collector to send cluster metrics to the CloudZero platform. -For the latest release, see [Releases](https://github.com/Cloudzero/cloudzero-charts/releases). You can also [enable release notifications](#enabling-release-notifications). +For the latest release, see [Releases](https://github.com/Cloudzero/cloudzero-charts/releases). You can also [enable release notifications](#enabling-release-notifications). ## Prerequisites From 69940404a3a67c261c0239ac71b692c323b9179e Mon Sep 17 00:00:00 2001 From: pinkneyj Date: Wed, 5 Aug 2026 14:31:31 +0100 Subject: [PATCH 3/3] remove whitespace --- helm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/README.md b/helm/README.md index 4ea8eaeb..3f840d03 100644 --- a/helm/README.md +++ b/helm/README.md @@ -6,7 +6,7 @@ A Helm chart for deploying a metrics collector to send cluster metrics to the CloudZero platform. -For the latest release, see [Releases](https://github.com/Cloudzero/cloudzero-charts/releases). You can also [enable release notifications](#enabling-release-notifications). +For the latest release, see [Releases](https://github.com/Cloudzero/cloudzero-charts/releases). You can also [enable release notifications](#enabling-release-notifications). ## Prerequisites