From baa03d927814138e536f0e528b56c808108f6071 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Sat, 18 Jan 2025 17:59:29 -0500
Subject: [PATCH] =?UTF-8?q?Add=20nodeSelector,=20affinity,=20and=20tolerat?=
 =?UTF-8?q?ion=20fields=20for=20pre-upgrade-job=E2=80=A6=20(#288)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add nodeSelector, affinity, and toleration fields for pre-upgrade-job in ziti-route Chart

* bump router versions

---------

Co-authored-by: Oleksandr Bezerov <oleksandr.bezerov@kestramedical.com>
---
 charts/ziti-router/Chart.yaml                     |  4 ++--
 charts/ziti-router/README.md                      |  2 +-
 charts/ziti-router/templates/pre-upgrade-job.yaml | 12 ++++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/charts/ziti-router/Chart.yaml b/charts/ziti-router/Chart.yaml
index 707abf55..b11bc7dd 100644
--- a/charts/ziti-router/Chart.yaml
+++ b/charts/ziti-router/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 1.1.15
+appVersion: 1.1.16
 description: Host an OpenZiti router in Kubernetes
 name: ziti-router
 type: application
-version: 1.1.3
+version: 1.1.4
diff --git a/charts/ziti-router/README.md b/charts/ziti-router/README.md
index 0063e1dc..286d7c95 100644
--- a/charts/ziti-router/README.md
+++ b/charts/ziti-router/README.md
@@ -1,7 +1,7 @@
 <!-- README.md generated by helm-docs from README.md.gotmpl -->
 # ziti-router
 
-![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.15](https://img.shields.io/badge/AppVersion-1.1.15-informational?style=flat-square)
+![Version: 1.1.4](https://img.shields.io/badge/Version-1.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.16](https://img.shields.io/badge/AppVersion-1.1.16-informational?style=flat-square)
 
 Host an OpenZiti router in Kubernetes
 
diff --git a/charts/ziti-router/templates/pre-upgrade-job.yaml b/charts/ziti-router/templates/pre-upgrade-job.yaml
index 885f4175..488ad052 100644
--- a/charts/ziti-router/templates/pre-upgrade-job.yaml
+++ b/charts/ziti-router/templates/pre-upgrade-job.yaml
@@ -45,6 +45,18 @@ spec:
             readOnly: false
         command: ["migrate-identity.bash"]
         # command: ["sh", "-c", "while true; do sleep 86400; done"]
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: migrate-script
           configMap: