summaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorjasmineWen <jasmine.wen@amdocs.com>2018-10-10 19:48:21 +0000
committerjasmineWen <jasmine.wen@amdocs.com>2018-10-10 19:51:44 +0000
commit6715c7d660166739690c8be28d56790c45deded7 (patch)
tree78d5a81dd61ff1d0e11fb51b0a53aff7fe2952e3 /kubernetes/common
parent3d554cf1a315efc2c4d20b44e1a49f840aa953dc (diff)
pgpool - avoid duplicate configmap names
Issue-ID: OOM-1355 Change-Id: I525bda260f55233385191609ce9b021fb7dd3444 Signed-off-by: jasmineWen <jasmine.wen@amdocs.com>
Diffstat (limited to 'kubernetes/common')
-rwxr-xr-xkubernetes/common/postgres/charts/pgpool/templates/configmap.yaml2
-rw-r--r--kubernetes/common/postgres/charts/pgpool/templates/deployment.yaml10
2 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml b/kubernetes/common/postgres/charts/pgpool/templates/configmap.yaml
index 10ebd7fd7f..e2c77ff910 100755
--- 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 a05bed4b5f..4aa8d831fb 100644
--- 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