[COMMON] Allow to choose between nodePortPrefix and nodePortPrefixExt

Add the ability to specify whether a nodePortPrefix or
nodePortPrefixExt should be used while defining a port using common
service template.

Now you can specify:

ports:
  - name: http
    port: 9098
    nodePort: "09"
    prefix: nodePortPrefixExt

Issue-ID: OOM-1971
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Ied78584e5b1c8f479ca180890df67ad4dee3501a

diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index 075f796..55f73c1 100644 (file)
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -56,15 +56,18 @@ labels: {{- include "common.labels" $dot | nindent 2 -}}
      - .dot : environment (.)
      - .ports : an array of ports
      - .portType: the type of the service
+     - .prefix: NodePort prefix to be used
+
 */}}
 {{- define "common.servicePorts" -}}
 {{- $portType := .portType -}}
 {{- $dot := .dot -}}
 {{- range $index, $port := .ports }}
+{{- $portPrefix := default "nodePortPrefix" $port.prefix }}
 - port: {{ $port.port }}
   targetPort: {{ $port.name }}
   {{- if (eq $portType "NodePort") }}
-  nodePort: {{ $dot.Values.global.nodePortPrefix | default $dot.Values.nodePortPrefix }}{{ $port.nodePort }}
+  nodePort: {{ index $dot.Values "global" $portPrefix | default (index $dot.Values $portPrefix) }}{{ $port.nodePort }}
   {{- end }}
   name: {{ $port.name }}
 {{- end -}}