[TT-13934] Add tolerations, affinity and node selector to tyk-bootstr…

…ap and tyk-operator (#381) * Add to values.yaml * fix spacing * add to bootstrap * Add to cp chart --------- Co-authored-by: Mladen Kolavcic <[email protected]>
TykTechnologies · Feb 27, 2025 · 0fca9b5 · 0fca9b5
1 parent 847e684
commit 0fca9b5
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 0 deletions.
diff --git a/components/tyk-bootstrap/templates/bootstrap-post-install.yaml b/components/tyk-bootstrap/templates/bootstrap-post-install.yaml
@@ -31,6 +31,18 @@ spec:
         {{- end }} 
     spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
+{{- if .Values.bootstrap.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.bootstrap.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.tolerations }}
+      tolerations:
+{{ toYaml .Values.bootstrap.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.affinity }}
+      affinity:
+{{ toYaml .Values.bootstrap.affinity | indent 8 }}
+{{- end }}
       containers:
         - name: bootstrap-tyk-post-install
           image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.postInstall.image.repository }}:{{ .Values.bootstrap.jobs.postInstall.image.tag }}

diff --git a/components/tyk-bootstrap/templates/bootstrap-pre-delete.yaml b/components/tyk-bootstrap/templates/bootstrap-pre-delete.yaml
@@ -34,6 +34,18 @@ spec:
         {{- end }}        
     spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
+{{- if .Values.bootstrap.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.bootstrap.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.tolerations }}
+      tolerations:
+{{ toYaml .Values.bootstrap.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.affinity }}
+      affinity:
+{{ toYaml .Values.bootstrap.affinity | indent 8 }}
+{{- end }}
       containers:
         - name: bootstrap-tyk-pre-delete
           image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.preDelete.image.repository }}:{{ .Values.bootstrap.jobs.preDelete.image.tag }}

diff --git a/components/tyk-bootstrap/templates/bootstrap-pre-install.yaml b/components/tyk-bootstrap/templates/bootstrap-pre-install.yaml
@@ -30,6 +30,18 @@ spec:
         {{- end }}    
     spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
+{{- if .Values.bootstrap.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.bootstrap.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.tolerations }}
+      tolerations:
+{{ toYaml .Values.bootstrap.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.bootstrap.affinity }}
+      affinity:
+{{ toYaml .Values.bootstrap.affinity | indent 8 }}
+{{- end }}
       containers:
         - name: bootstrap-tyk-pre-install
           image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.preInstall.image.repository }}:{{ .Values.bootstrap.jobs.preInstall.image.tag }}

diff --git a/components/tyk-bootstrap/values.yaml b/components/tyk-bootstrap/values.yaml
@@ -165,6 +165,15 @@ bootstrap:
     # preDeletePodLabels specifies labels to be added to Tyk Bootstrap pre-delete hook's job pods.
     preDeletePodLabels: {}
 
+  # node labels for bootstrap pods assignment
+  nodeSelector: {}
+
+  # tolerations for bootstrap pods assignment
+  tolerations: {}
+
+  # affinity for bootstrap pods assignment
+  affinity: {}
+
   # containerSecurityContext values for bootstrap containers
   containerSecurityContext:
     runAsNonRoot: true

diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml
@@ -721,6 +721,11 @@ tyk-operator:
     allowPrivilegeEscalation: false
   resources: {}
   nodeSelector: {}
+  # tolerations for tyk-operator-manager pod assignment
+  tolerations: {}
+
+  # affinity for tyk-operator-manager pod assignment
+  affinity: {}
   hostNetwork: false
 
   # rbac specifies necessary resources for kube-rbac-proxy.
@@ -1092,6 +1097,15 @@ tyk-bootstrap:
       # preDeletePodLabels specifies labels to be added to Tyk Bootstrap pre-delete hook's job pods.
       preDeletePodLabels: {}
 
+    # node labels for bootstrap pods assignment
+    nodeSelector: {}
+
+    # tolerations for bootstrap pods assignment
+    tolerations: {}
+
+    # affinity for bootstrap pods assignment
+    affinity: {}
+
     # extraVolumes is a list of volumes to be added to the pod
     # extraVolumes:
     #   - name: ca-certs

diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
@@ -642,6 +642,11 @@ tyk-operator:
     allowPrivilegeEscalation: false
   resources: {}
   nodeSelector: {}
+  # tolerations for tyk-operator-manager pod assignment
+  tolerations: {}
+
+  # affinity for tyk-operator-manager pod assignment
+  affinity: {}
   hostNetwork: false
 
   # rbac specifies necessary resources for kube-rbac-proxy.

diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
@@ -736,6 +736,11 @@ tyk-operator:
     allowPrivilegeEscalation: false
   resources: {}
   nodeSelector: {}
+  # tolerations for tyk-operator-manager pod assignment
+  tolerations: {}
+
+  # affinity for tyk-operator-manager pod assignment
+  affinity: {}
   hostNetwork: false
 
   # rbac specifies necessary resources for kube-rbac-proxy.
@@ -1105,6 +1110,15 @@ tyk-bootstrap:
       # preDeletePodLabels specifies labels to be added to Tyk Bootstrap pre-delete hook's job pods.
       preDeletePodLabels: {}
 
+    # node labels for bootstrap pods assignment
+    nodeSelector: {}
+
+    # tolerations for bootstrap pods assignment
+    tolerations: {}
+
+    # affinity for bootstrap pods assignment
+    affinity: {}
+
     # extraVolumes is a list of volumes to be added to the pod
     # extraVolumes:
     #   - name: ca-certs