diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2022-08-31 13:56:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-08-31 13:56:50 +0000 |
| commit | b0a8776f0bcce80f80caaf83119666163a63376b (patch) | |
| tree | eb5060802abb991a52ae3588e9914ad5d9f9685f /kubernetes | |
| parent | 1dff631822c286b5163d06b1bcce93f342f0dbaf (diff) | |
| parent | d59ac60a58666f526ee26445d473712a26220432 (diff) | |
Merge "[COMMON] Disable Nodeports in _service template"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/common/common/templates/_service.tpl | 3 | ||||
| -rw-r--r-- | kubernetes/common/elasticsearch/components/master/values.yaml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl index f6a0f211a9..379992eae8 100644 --- a/kubernetes/common/common/templates/_service.tpl +++ b/kubernetes/common/common/templates/_service.tpl @@ -241,6 +241,9 @@ spec: {{- $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 2eae0de4c0..a2ec7b92db 100644 --- a/kubernetes/common/elasticsearch/components/master/values.yaml +++ b/kubernetes/common/elasticsearch/components/master/values.yaml @@ -22,6 +22,8 @@ global: backup: mountPath: /dockerdata-nfs/backup storageClass: + serviceMesh: + enabled: false ################################################################# # Application configuration defaults. |