Specify the supervisor NodePort Service's port and nodePort separately

When using kind we forward the node's port to the host, so we only
really care about the `nodePort` value. For acceptance clusters,
we put an Ingress in front of a NodePort Service, so we only really
care about the `port` value.

deploy/supervisor/service.yaml

@@ -18,9 +18,11 @@ spec:
     app: #@ data.values.app_name
   ports:
     - protocol: TCP
-      port: 80
+      port: #@ data.values.service_nodeport_port
       targetPort: 80
-      nodePort: #@ data.values.service_nodeport_port
+      #@ if data.values.service_nodeport_nodeport:
+      nodePort: #@ data.values.service_nodeport_nodeport
+      #@ end
 #@ end
 
 #@ if data.values.service_clusterip_port:

deploy/supervisor/values.yaml

@@ -38,6 +38,7 @@ image_pull_dockerconfigjson: #! e.g. {"auths":{"https://registry.example.com":{"
 #! Specify how to expose the Supervisor app as a Service.
 #! Typically you would set a value for only one of the following.
 #! Setting any of these values means that a Service of that type will be created.
-service_nodeport_port: #! e.g. 31234
-service_loadbalancer_port: #! e.g. 443
-service_clusterip_port: #! e.g. 443
+service_nodeport_port: #! when specified, creates a NodePort Service with this `port` value, e.g. 31234
+service_nodeport_nodeport: #! the `nodePort` value of the NodePort Service, optional when `service_nodeport_port` is specified, e.g. 31234
+service_loadbalancer_port: #! when specified, creates a LoadBalancer Service with this `port` value, e.g. 443
+service_clusterip_port: #! when specified, creates a ClusterIP Service with this `port` value, e.g. 443