[COMMON] Disable Nodeports in _service template
When using the _service template in case of ServiceMesh a NodePort
is changed to a ClusterIP
Issue-ID: OOM-2013
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I42fa1af57dc393356990bedc3ec52babb4f6c09a
diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl
index f6a0f21..379992e 100644
--- a/kubernetes/common/common/templates/_service.tpl
+++ b/kubernetes/common/common/templates/_service.tpl
@@ -241,6 +241,9 @@
{{- $both_tls_and_plain:= default false $dot.Values.service.both_tls_and_plain }}
{{- $labels := default (dict) .labels -}}
{{- $matchLabels := default (dict) .matchLabels -}}
+{{- if and (include "common.onServiceMesh" $dot) (eq $serviceType "NodePort") }}
+{{- $serviceType = "ClusterIP" }}
+{{- end }}
{{- if (and (include "common.needTLS" $dot) $both_tls_and_plain) }}
{{ include "common.genericService" (dict "suffix" $suffix "annotations" $annotations "msb_informations" $msb_informations "dot" $dot "publishNotReadyAddresses" $publishNotReadyAddresses "ports" $ports "serviceType" "ClusterIP" "add_plain_port" true $labels "matchLabels" $matchLabels) }}
diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index 2eae0de..a2ec7b9 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -22,6 +22,8 @@
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
+ serviceMesh:
+ enabled: false
#################################################################
# Application configuration defaults.