pgpool - avoid duplicate configmap names

Issue-ID: OOM-1355

Change-Id: I525bda260f55233385191609ce9b021fb7dd3444
Signed-off-by: jasmineWen <jasmine.wen@amdocs.com>

diff --git a/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml b/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml
index 10ebd7f..e2c77ff 100755 (executable)
--- a/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-pgpool-configmap
+  name: {{ include "common.fullname" . }}-pgpool-configmap
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}

diff --git a/kubernetes/common/postgres/charts/pgpool/templates/deployment.yaml b/kubernetes/common/postgres/charts/pgpool/templates/deployment.yaml
index a05bed4..4aa8d83 100644 (file)
--- a/kubernetes/common/postgres/charts/pgpool/templates/deployment.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/templates/deployment.yaml
@@ -15,7 +15,7 @@
 */}}
 kind: Deployment
 apiVersion: extensions/v1beta1
-metadata: 
+metadata:
   name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
@@ -23,7 +23,7 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-spec: 
+spec:
   replicas: 2
   template:
     metadata:
@@ -53,8 +53,8 @@ spec:
             port: 5432
           initialDelaySeconds: 20
           periodSeconds: 10
-        livenessProbe: 
-          tcpSocket: 
+        livenessProbe:
+          tcpSocket:
             port: 5432
         initialDelaySeconds: 15
         periodSeconds: 20
@@ -65,4 +65,4 @@ spec:
       volumes:
       - name: pgpool-pgconf
         configMap:
-          name: {{ .Release.Name }}-pgpool-configmap
+          name: {{ include "common.fullname" . }}-pgpool-configmap