From: Mike Elliott <mike.elliott@amdocs.com>
Date: Thu, 13 Sep 2018 13:32:08 +0000 (-0400)
Subject: Add mariadb-galera port name override
X-Git-Tag: 3.0.0-ONAP~364^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4c88b2d357750ab3a5f2ec4ef05f81c9c3ce22b4;p=oom.git

Add mariadb-galera port name override

The service name was being used as the port name. There is a 15 character
limit for a port name in Helm. This patch allows another chart to configure
the port name that is used via service.portName.

Change-Id: Ie4b805a5e58a53b10480961e543267ca8bb1dc00
Issue-ID: CCSDK-523
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
---

diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index 20a03499bb..8b2aafbd49 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -73,13 +73,13 @@ spec:
                   key: db-root-password
           ports:
           - containerPort: {{ .Values.service.internalPort }}
-            name: {{ .Values.service.name }}
+            name: {{ .Values.service.portName }}
           - containerPort: {{ .Values.service.sstPort }}
-            name: {{ .Values.service.sstName }}
+            name: {{ .Values.service.sstPortName }}
           - containerPort: {{ .Values.service.replicationPort }}
             name: {{ .Values.service.replicationName }}
           - containerPort: {{ .Values.service.istPort }}
-            name: {{ .Values.service.istName }}
+            name: {{ .Values.service.istPortName }}
           readinessProbe:
             exec:
               command:
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index aea2c45d4a..51f446fd68 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -87,11 +87,11 @@ service:
   name: mariadb-galera
   portName: mariadb-galera
   sstPort: 4444
-  sstName: sst
+  sstPortName: sst
   replicationPort: 4567
   replicationName: replication
   istPort: 4568
-  istName: ist
+  istPortName: ist
 
 ingress:
   enabled: false