From 3be6c52a64b21998ab96966eac6aafb103dba795 Mon Sep 17 00:00:00 2001
From: Jean Mainguy <9969006+jhandguy@users.noreply.github.com>
Date: Mon, 21 Feb 2022 00:01:39 +0100
Subject: [PATCH] feat(argo-rollouts): Add ability to define dashboard service
 node port (#1138)

* feat(argo-rollouts): Add ability to define dashboard service node port

Signed-off-by: Jean Mainguy <9969006+jhandguy@users.noreply.github.com>

* Apply changes from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-rollouts/Chart.yaml                       | 4 ++--
 charts/argo-rollouts/README.md                        | 3 ++-
 charts/argo-rollouts/templates/dashboard/service.yaml | 3 +++
 charts/argo-rollouts/values.yaml                      | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 3a04fca9..9acbdbd5 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v1.1.1"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.9.3
+version: 2.10.0
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
@@ -11,4 +11,4 @@ maintainers:
   - name: jessesuen
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Use helm-docs to generate README.md"
+    - "[Added]: Ability to define dashboard service node port"
diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md
index 162ddb25..4230a3f8 100644
--- a/charts/argo-rollouts/README.md
+++ b/charts/argo-rollouts/README.md
@@ -110,6 +110,7 @@ If dashboard is installed by `--set dashboard.enabled=true`, checkout the argo-r
 | dashboard.service.labels | object | `{}` | Service labels |
 | dashboard.service.loadBalancerIP | string | `""` | LoadBalancer will get created with the IP specified in this field |
 | dashboard.service.loadBalancerSourceRanges | list | `[]` | Source IP ranges to allow access to service from |
+| dashboard.service.nodePort | int | `nil` | Service nodePort |
 | dashboard.service.port | int | `3100` | Service port |
 | dashboard.service.portName | string | `"dashboard"` | Service port name |
 | dashboard.service.targetPort | int | `3100` | Service target port |
@@ -147,4 +148,4 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
 [Node selector]: https://kubernetes.io/docs/user-guide/node-selection/
 [probe]: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 [Tolerations]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-[values.yaml]: https://github.com/argoproj/argo-helm/blob/argo-rollouts-2.9.3/charts/argo-rollouts/values.yaml
+[values.yaml]: https://github.com/argoproj/argo-helm/blob/argo-rollouts-2.10.0/charts/argo-rollouts/values.yaml
diff --git a/charts/argo-rollouts/templates/dashboard/service.yaml b/charts/argo-rollouts/templates/dashboard/service.yaml
index 92c41114..58978150 100644
--- a/charts/argo-rollouts/templates/dashboard/service.yaml
+++ b/charts/argo-rollouts/templates/dashboard/service.yaml
@@ -34,6 +34,9 @@ spec:
     protocol: TCP
     port: {{ .Values.dashboard.service.port }}
     targetPort: {{ .Values.dashboard.service.targetPort }}
+    {{- if and (eq .Values.dashboard.service.type "NodePort") .Values.dashboard.service.nodePort }}
+    nodePort: {{ .Values.dashboard.service.nodePort }}
+    {{- end }}
   selector:
     app.kubernetes.io/component: {{ .Values.dashboard.component }}
     {{- include "argo-rollouts.selectorLabels" . | nindent 4 }}
diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml
index 53b94bf7..94e80379 100644
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@@ -181,6 +181,8 @@ dashboard:
     port: 3100
     # -- Service target port
     targetPort: 3100
+    # -- (int) Service nodePort
+    nodePort:
   serviceAccount:
     # -- Specifies whether a dashboard service account should be created
     create: true