summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-24 16:22:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-24 16:22:28 +0000
commit6273f3de201e3e7dad742727835ff2aa5a2a5de0 (patch)
tree920426b0dc2e53dda6c5da4c39d2013300b0d242
parent23a95a751a002163f61cb7eafb4dc84465415daa (diff)
parent99d802b0e65beedd6ee17b6b469363cd5f9491b3 (diff)
Merge "changing portal liveness/readiness probe"
-rw-r--r--kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml18
1 files changed, 14 insertions, 4 deletions
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index cfd3ac507c..920efbcd49 100644
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@ -42,14 +42,20 @@ spec:
- containerPort: {{ .Values.service.internalPort5 }}
{{ if eq .Values.liveness.enabled true }}
livenessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
+ exec:
+ command:
+ - /bin/bash
+ - -c
+ - nodetool status | grep $POD_IP | awk '$1!="UN" { exit 1; }'
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
+ exec:
+ command:
+ - /bin/bash
+ - -c
+ - nodetool status | grep $POD_IP | awk '$1!="UN" { exit 1; }'
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
@@ -57,6 +63,10 @@ spec:
value: "{{ .Values.config.cassandraUsername }}"
- name: CASSPASS
value: "{{ .Values.config.cassandraPassword }}"
+ - name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
volumeMounts:
- mountPath: /etc/localtime
name: localtime