summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Xu <yang.xu@futurewei.com>2019-06-15 23:54:23 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-15 23:54:23 +0000
commitf889e6a0004b3153c8cafffc6c8489729d7d9fd3 (patch)
tree7953ed2d208df8224eace93158fd79833516a63c
parentbb3f4c1abf14069c47f99edbb4f1d4859e70abde (diff)
parentbec0c98d5789051dca6b108d42a4a687bbb0a7f2 (diff)
Merge "cassandra livenessProbe chart error"
-rw-r--r--.gitignore2
-rw-r--r--kubernetes/common/cassandra/templates/statefulset.yaml2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 92ead3a11c..96e76c17fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ kubernetes/config/onap-parameters.yaml
kubernetes/dist/*
requirements.lock
**/charts/*.tgz
+*.orig
# AAI Schema
**/schema/*
@@ -21,3 +22,4 @@ requirements.lock
# Mac OS
*DS_Store*
+
diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index 0c7a112bcb..4be3570851 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -74,7 +74,7 @@ spec:
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
successThreshold: {{ .Values.liveness.successThreshold }}
failureThreshold: {{ .Values.liveness.failureThreshold }}
- {{ end -}}
+ {{ end }}
readinessProbe:
exec:
command: