[incubator-heron] 03/04: Better value.yaml settings for nodeport config

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nicknezis pushed a commit to branch helm-nodeport
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git

commit ae4de0a03c747e2d7a48898566fcb0ec226d64a5
Author: Windham Wong <wi...@stormeye.io>
AuthorDate: Fri Nov 5 15:15:14 2021 +0800

    Better value.yaml settings for nodeport config
---
 deploy/kubernetes/helm/templates/tools.yaml | 6 +++---
 deploy/kubernetes/helm/values.yaml.template | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/helm/templates/tools.yaml b/deploy/kubernetes/helm/templates/tools.yaml
index 5bee96b..dfaa3fc 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -285,10 +285,10 @@ spec:
     - port: 9000
       targetPort: 9000
       protocol: TCP
-      {{- if not (empty .Values.apiserver.NodePort) }}
-      nodePort: {{ .Values.apiserver.NodePort }}
+      {{- if .Values.apiserver.NodePort.enabled }}
+      nodePort: {{ .Values.apiserver.NodePort.port }}
       {{- end }}
-  {{- if not (empty .Values.apiserver.NodePort) }}
+  {{- if .Values.apiserver.NodePort.enabled }}
   type: NodePort
   {{- else }}
   type: ClusterIP
diff --git a/deploy/kubernetes/helm/values.yaml.template b/deploy/kubernetes/helm/values.yaml.template
index 3d20045..7a53969 100644
--- a/deploy/kubernetes/helm/values.yaml.template
+++ b/deploy/kubernetes/helm/values.yaml.template
@@ -44,7 +44,9 @@ heron:
   url: "-"
 
 apiserver:
-  NodePort: 32090
+  NodePort:
+    enabled: false
+    port: 32090
 
 # Can be EQUAL_TO_LIMIT or NOT_SET
 topologyResourceRequestMode: EQUAL_TO_LIMIT