diff options
author | 2018-04-20 18:26:53 +0000 | |
---|---|---|
committer | 2018-04-20 18:26:53 +0000 | |
commit | df82a596ddec19bdb16af3b1673cbf149b339573 (patch) | |
tree | 40ffbc396949e4f97cc901baf2395d6e768ccf9d /kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml | |
parent | eb47e3e157856c02b957fb3816cad29e016fa98c (diff) | |
parent | bbd805bb8a574f56e9001facf182bcf387ba5957 (diff) |
Merge "getting portal-cassandra music to start"
Diffstat (limited to 'kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml')
-rw-r--r-- | kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml index 91c4fa4140..cfd3ac507c 100644 --- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml +++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml @@ -40,13 +40,13 @@ spec: - containerPort: {{ .Values.service.internalPort3 }} - containerPort: {{ .Values.service.internalPort4 }} - containerPort: {{ .Values.service.internalPort5 }} - {{- if eq .Values.liveness.enabled true }} + {{ if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -56,10 +56,7 @@ spec: - name: CASSUSER value: "{{ .Values.config.cassandraUsername }}" - name: CASSPASS - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }} - key: db-root-password + value: "{{ .Values.config.cassandraPassword }}" volumeMounts: - mountPath: /etc/localtime name: localtime @@ -70,6 +67,8 @@ spec: - name: cassandra-docker-entrypoint-initdb mountPath: /docker-entrypoint-initdb.d/zzz_portalsdk.cql subPath: portalsdk.cql + - name: {{ include "common.fullname" . }}-data + mountPath: /var/lib/cassandra/data resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} @@ -87,5 +86,12 @@ spec: - name: localtime hostPath: path: /etc/localtime + {{- if .Values.persistence.enabled }} + - name: {{ include "common.fullname" . }}-data + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |