From 58fb4b4d2c2fea279748de2b61349e20ee607f83 Mon Sep 17 00:00:00 2001
From: shirtabachii <shir.tabachi@codefresh.io>
Date: Tue, 12 May 2026 15:37:11 +0300
Subject: [PATCH 1/2] feat(kubernetes-agent): add nodeSelector for
 kubernetes-agent

---
 .../templates/tentacle-deployment.yaml         | 18 +++++++++++-------
 charts/kubernetes-agent/values.yaml            |  6 +++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/charts/kubernetes-agent/templates/tentacle-deployment.yaml b/charts/kubernetes-agent/templates/tentacle-deployment.yaml
index 091870ba..00384a8d 100644
--- a/charts/kubernetes-agent/templates/tentacle-deployment.yaml
+++ b/charts/kubernetes-agent/templates/tentacle-deployment.yaml
@@ -165,28 +165,28 @@ spec:
             {{- if or .Values.agent.bearerToken .Values.agent.bearerTokenSecretName  }}
             - name: "BearerToken"
               valueFrom:
-                secretKeyRef: 
+                secretKeyRef:
                   name: {{ .Values.agent.bearerTokenSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
                   key: bearer-token
             {{- end }}
             {{- if or .Values.agent.username .Values.agent.usernamePasswordSecretName }}
             - name: "ServerUsername"
               valueFrom:
-                secretKeyRef: 
+                secretKeyRef:
                   name: {{ .Values.agent.usernamePasswordSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
                   key: username
             {{- end }}
             {{- if or .Values.agent.password .Values.agent.usernamePasswordSecretName }}
             - name: "ServerPassword"
               valueFrom:
-                secretKeyRef: 
+                secretKeyRef:
                   name: {{ .Values.agent.usernamePasswordSecretName | default (include "kubernetes-agent.secrets.serverAuth" .) }}
                   key: password
             {{- end }}
             {{- if .Values.agent.certificate }}
             - name: "TentacleCertificateBase64"
               valueFrom:
-                secretKeyRef: 
+                secretKeyRef:
                   name: {{ include "kubernetes-agent.secrets.certificate" . }}
                   key: certificate
             {{- end}}
@@ -202,14 +202,14 @@ spec:
             - name: "TentaclePollingProxyPort"
               value: {{ .Values.agent.pollingProxy.port | quote }}
             - name: "TentaclePollingProxyUsername"
-              value: {{ .Values.agent.pollingProxy.username | quote }}              
+              value: {{ .Values.agent.pollingProxy.username | quote }}
             {{- if .Values.agent.pollingProxy.password }}
             - name: "TentaclePollingProxyPassword"
               valueFrom:
-                secretKeyRef: 
+                secretKeyRef:
                   name: {{ include "kubernetes-agent.secrets.serverAuth" . }}
                   key: polling-proxy-password
-            {{- end }}            
+            {{- end }}
             {{- end }}
             {{- with .Values.agent.containers.tentacle.env }}
             {{- toYaml . | nindent 12 }}
@@ -292,6 +292,10 @@ spec:
         - name: temp-dir
           emptyDir: {}
         {{- end }}
+      {{- with .Values.agent.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.agent.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/kubernetes-agent/values.yaml b/charts/kubernetes-agent/values.yaml
index b33fe98a..b61b652d 100644
--- a/charts/kubernetes-agent/values.yaml
+++ b/charts/kubernetes-agent/values.yaml
@@ -157,6 +157,10 @@ agent:
   # @section -- Agent values
   tolerations: []
 
+  # -- The node selectors to apply to the agent pod
+  # @section -- Agent values
+  nodeSelector: {}
+
   # -- The affinities to apply to the agent pod
   # @section -- Agent values
   affinity:
@@ -393,7 +397,7 @@ persistence:
   # -- The NFS server PV reclaim policy
   # @section -- Persistence
   persistentVolumeReclaimPolicy: Retain
-  
+
   nfs:
     # -- If enabled, runs an in-cluster NFS server pod to support scaled, multi-node script pod execution.
     # @section -- Persistence

From 61bde8dc3be9574f6688d8dcba629ff1b3a71783 Mon Sep 17 00:00:00 2001
From: shirtabachii <shir.tabachi@codefresh.io>
Date: Thu, 14 May 2026 15:14:23 +0300
Subject: [PATCH 2/2] feat(kubernetes-agent): add nodeSelector for
 kubernetes-agent

---
 charts/kubernetes-agent/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md
index b1242f62..18ab55c5 100644
--- a/charts/kubernetes-agent/README.md
+++ b/charts/kubernetes-agent/README.md
@@ -70,6 +70,7 @@ The Kubernetes monitor is optionally installed alongside the Kubernetes agent, [
 | agent.machinePolicyName | string | `""` | The machine policy to register the agent with |
 | agent.metadata | object | `{"annotations":{},"labels":{}}` | Additional metadata to add to the agent pod & container |
 | agent.name | string | `""` | The name of the agent |
+| agent.nodeSelector | object | `{}` | The node selectors to apply to the agent pod |
 | agent.password | string | `""` | The password of the user used to authenticate with the target Octopus Server |
 | agent.pollingConnectionCount | int | `5` | The number of polling TCP connections to open with the target Octopus Server |
 | agent.pollingProxy | object | `{"host":"","password":"","port":80,"username":""}` | The host, port, username and password of the proxy server to use for polling connections |