From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Thu, 2 Jun 2022 09:48:30 +0000 (+0200)
Subject: [COMMON][ELASTIC] ElasticSearch ServiceMesh compatibility
X-Git-Tag: 11.0.0~115^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=90aa482417e8731446baaa2040ff12531d6a4c58

[COMMON][ELASTIC] ElasticSearch ServiceMesh compatibility

Rename the ES ports to fit to the Istio Naming schema.

Issue-ID: OOM-2820

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I030c29883755dfaba7a76b167f2f7895a9d4521c
---

diff --git a/kubernetes/common/elasticsearch/components/data/values.yaml b/kubernetes/common/elasticsearch/components/data/values.yaml
index 1328a20439..1dc9ab8588 100644
--- a/kubernetes/common/elasticsearch/components/data/values.yaml
+++ b/kubernetes/common/elasticsearch/components/data/values.yaml
@@ -47,7 +47,7 @@ replicaCount: 0
 service:
   ## list of ports for "common.containerPorts"
   ports:
-  - name: http-transport
+  - name: tcp-transport
     port: 9300
 
 image: bitnami/elasticsearch:7.9.3
diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index 33804494e9..2eae0de4c0 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -170,7 +170,7 @@ service:
   ## list of ports for "common.containerPorts"
   ## Elasticsearch transport port
   ports:
-    - name: http-transport
+    - name: tcp-transport
       port: 9300
   ## master-eligible service type
   ##
diff --git a/kubernetes/common/elasticsearch/values.yaml b/kubernetes/common/elasticsearch/values.yaml
index a3f15645a3..6c46f32c96 100644
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@ -148,7 +148,7 @@ nginx:
   service:
     name: nginx
     ports:
-    - name: elasticsearch
+    - name: http-es
       port: 8080
 ## Custom server block to be added to NGINX configuration
 ## PHP-FPM example server block:
@@ -230,7 +230,7 @@ service:
   ##
   type: ClusterIP
   headlessPorts:
-  - name: http-transport
+  - name: tcp-transport
     port: 9300
   headless:
     suffix: discovery
@@ -240,7 +240,7 @@ service:
   ## Elasticsearch tREST API port
   ##
   ports:
-  - name: elasticsearch
+  - name: http-es
     port: 9200