From c5a7cfbed7b31bcd9f6b85fb299d8b0392276791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 21 Oct 2022 17:22:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20NodePort=20?=
 =?UTF-8?q?=E5=89=8D=E5=90=8E=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charts/jumpserver/templates/koko/service-koko.yaml     | 3 +++
 charts/jumpserver/templates/magnus/service-magnus.yaml | 3 +++
 charts/jumpserver/templates/razor/service-razor.yaml   | 3 +++
 charts/jumpserver/templates/web/service-web.yaml       | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/charts/jumpserver/templates/koko/service-koko.yaml b/charts/jumpserver/templates/koko/service-koko.yaml
index 268bd1d..a7d9e8f 100644
--- a/charts/jumpserver/templates/koko/service-koko.yaml
+++ b/charts/jumpserver/templates/koko/service-koko.yaml
@@ -19,6 +19,9 @@ spec:
       name: web
     - port: {{ .service.ssh.port }}
       targetPort: ssh
+      {{- if eq .service.type "NodePort" }}
+      nodePort: {{ .service.ssh.port }}
+      {{- end }}
       protocol: TCP
       name: ssh
   sessionAffinity: ClientIP
diff --git a/charts/jumpserver/templates/magnus/service-magnus.yaml b/charts/jumpserver/templates/magnus/service-magnus.yaml
index 85dc245..27a967c 100644
--- a/charts/jumpserver/templates/magnus/service-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/service-magnus.yaml
@@ -17,6 +17,9 @@ spec:
   ports:
     {{- range $port := untilStep $magnusPortStart $magnusPortEnd 1 }}
     - port: {{ $port }}
+      {{- if eq $.Values.magnus.service.type "NodePort" }}
+      nodePort: {{ $port }}
+      {{- end }}
       targetPort: magnus-{{ $port }}
       protocol: TCP
       name: magnus-{{ $port }}
diff --git a/charts/jumpserver/templates/razor/service-razor.yaml b/charts/jumpserver/templates/razor/service-razor.yaml
index 24bd193..6848dde 100644
--- a/charts/jumpserver/templates/razor/service-razor.yaml
+++ b/charts/jumpserver/templates/razor/service-razor.yaml
@@ -15,6 +15,9 @@ spec:
   ports:
     - port: {{ .service.rdp.port }}
       targetPort: rdp
+      {{- if eq .service.type "NodePort" }}
+      nodePort: {{ .service.rdp.port }}
+      {{- end }}
       protocol: TCP
       name: rdp
   sessionAffinity: ClientIP
diff --git a/charts/jumpserver/templates/web/service-web.yaml b/charts/jumpserver/templates/web/service-web.yaml
index f75e8c2..31c9169 100644
--- a/charts/jumpserver/templates/web/service-web.yaml
+++ b/charts/jumpserver/templates/web/service-web.yaml
@@ -15,6 +15,9 @@ spec:
   ports:
     - port: {{ .service.web.port }}
       targetPort: web
+      {{- if eq .service.type "NodePort" }}
+      nodePort: {{ .service.web.port }}
+      {{- end }}
       protocol: TCP
       name: web
   sessionAffinity: ClientIP