From 735f212f966726a487e0e9cf66b7537f97b504ac Mon Sep 17 00:00:00 2001
From: Peter O <peteroruba@users.noreply.github.com>
Date: Mon, 27 Sep 2021 09:14:34 +0200
Subject: [PATCH] feat(argo-workflows): Allow NodePort to be specified for
 server service (#938)

* Allow NodePort to be specified for server service.

Signed-off-by: Peter Oruba <peter@oruba.de>

* Different version number and different condition in NodePort setting evaluation, both as per PR review suggested.

Signed-off-by: Peter Oruba <peter@oruba.de>
---
 charts/argo-workflows/Chart.yaml                           | 4 ++--
 charts/argo-workflows/templates/server/server-service.yaml | 3 +++
 charts/argo-workflows/values.yaml                          | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index 0c78db41..591b3aaf 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.6.0
+version: 0.7.0
 appVersion: "v3.1.8"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
@@ -15,4 +15,4 @@ maintainers:
   - name: benjaminws
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Add controller metricsConfig.portName parameter"
+    - "[Added]: Add server.serviceNodePort parameter"
diff --git a/charts/argo-workflows/templates/server/server-service.yaml b/charts/argo-workflows/templates/server/server-service.yaml
index 5d161ee8..49314e6e 100644
--- a/charts/argo-workflows/templates/server/server-service.yaml
+++ b/charts/argo-workflows/templates/server/server-service.yaml
@@ -17,6 +17,9 @@ spec:
     name: {{ . }}
     {{- end }}
     targetPort: 2746
+    {{- if and (eq .Values.server.serviceType "NodePort") .Values.server.serviceNodePort }}
+    nodePort: {{ .Values.server.serviceNodePort }}
+    {{- end }}
   selector:
     {{- include "argo-workflows.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
   sessionAffinity: None
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index 735ecb44..98a7fda6 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -223,6 +223,7 @@ server:
   name: server
   serviceType: ClusterIP
   servicePort: 2746
+  # serviceNodePort: 32746
   # servicePortName: http
   serviceAccount:
     create: true