From 99d802b0e65beedd6ee17b6b469363cd5f9491b3 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Tue, 24 Apr 2018 03:06:11 +0000 Subject: changing portal liveness/readiness probe Inspired by aai-cassandra's stateful set Using nodetool instead of a port. Issue-ID: MUSIC-72 Change-Id: I877300d772c3357855756a9dcac6f148381615da Signed-off-by: Mandeep Khinda --- .../charts/portal-cassandra/templates/deployment.yaml | 18 ++++++++++++++---- 1 file 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 -- cgit 1.2.3-korg