update setting nodeSelector and tolearations for NATS (#6886)

Author: ypoplavs

k8s/helm/testkube/Chart.yaml

@@ -18,7 +18,7 @@ dependencies:
     repository: oci://us-east1-docker.pkg.dev/testkube-cloud-372110/testkube
   - name: nats
     condition: testkube-api.nats.enabled
-    version: 1.2.6-3
+    version: 1.2.6-4
     repository: "file://./charts/nats"
   - name: testkube-api
     version: 2.x.x-x

k8s/helm/testkube/charts/nats/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
 - nats
 - messaging
 - cncf
-version: 1.2.6-3
+version: 1.2.6-4
 home: http://github.com/nats-io/k8s
 maintainers:
 - email: [email protected]

k8s/helm/testkube/charts/nats/files/stateful-set/pod-template.yaml

@@ -75,4 +75,10 @@ spec:
   {{- end}}
 
   securityContext:
-    {{- include "nats.podSecurityContext" $ | nindent 6 }}
+    {{- include "nats.podSecurityContext" $ | nindent 6 }}
+  nodeSelector:
+    {{- include "nats.nodeSelector" . | indent 4 }}
+  affinity:
+    {{- include "nats.affinity" . | indent 4 }}
+  tolerations:
+    {{- include "nats.tolerations" . | indent 4 }}

k8s/helm/testkube/charts/nats/templates/_helpers.tpl

@@ -301,4 +301,37 @@ Define containerSecurityContext
 {{- else }}
 {{- toYaml .Values.containerSecurityContext }}
 {{- end }}
+{{- end }}
+
+{{/*
+Define tolerations
+*/}}
+{{- define "nats.tolerations" -}}
+{{- if .Values.global.tolerations }}
+{{ toYaml .Values.global.tolerations }}
+{{- else }}
+{{ toYaml .Values.tolerations }}
+{{- end }}
+{{- end }}
+
+{{/*
+Define affinity
+*/}}
+{{- define "nats.affinity" -}}
+{{- if .Values.global.affinity }}
+{{ toYaml .Values.global.affinity }}
+{{- else }}
+{{ toYaml .Values.affinity }}
+{{- end }}
+{{- end }}
+
+{{/*
+Define nodeSelector
+*/}}
+{{- define "nats.nodeSelector" -}}
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector }}
+{{- else }}
+{{ toYaml .Values.nodeSelector }}
+{{- end }}
 {{- end }}

k8s/helm/testkube/charts/nats/values.yaml

@@ -15,6 +15,13 @@ global:
     # can be overridden by individual image registry
     registry:
 
+  # -- Global Tolerations
+  tolerations: []
+  # -- Global NodeSelector
+  nodeSelector: {}
+  # -- Global Affinity
+  affinity: {}
+
   # global labels will be applied to all resources deployed by the chart
   labels: {}
   # -- Security Context for all pods

k8s/helm/testkube/values.yaml

@@ -262,8 +262,6 @@ postgresql:
     pullSecrets: []
 
 ## NATS chart parameter
-## Tolerations to schedule a workload to nodes with any architecture type. Required for deployment to GKE cluster.
-## More info: https://cloud.google.com/kubernetes-engine/docs/how-to/prepare-arm-workloads-for-deployment#node-affinity-multi-arch-arm
 nats:
   # -- Uncomment to pass a global registry name to all NATS images
   # global:
@@ -276,12 +274,15 @@ nats:
   #     tag: 2.11.6-alpine
   #     pullPolicy:
   #     registry:
+  # Example of setting nodeSelector and tolerations
+  #  nodeSelector:
+  #    workload-type: infra
+  #  tolerations:
+  #  - effect: NoSchedule
+  #    key: workload-type
+  #    operator: Equal
+  #    value: infra
   # NATS Box container settings
-  # TODO remove this container after tests on dev and stage
-  # nats-box is A lightweight container with NATS utilities. It's not needed for nats server
-  # change it to
-  # natsBox:
-  #   enabled: false
   natsBox:
     enabled: false
     # -- Uncomment to override the NATS Box image options