summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/cassandra/templates
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-05-08 15:54:05 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-08 15:54:05 +0000
commit7da647362f5f163e05840a4e0e37e4badf1cd43e (patch)
tree4f495eaaac1cbb0c0dadc9538ebadca0c8b5f74e /kubernetes/common/cassandra/templates
parent51ed5c85158ba8991d923cf15b27d4cc16550ebe (diff)
parent8b20f77ac9cb60b7287bc10a0f25b04da17b7b24 (diff)
Merge "Common Cassandra doesn't support user authentication"
Diffstat (limited to 'kubernetes/common/cassandra/templates')
-rw-r--r--kubernetes/common/cassandra/templates/configmap.yaml14
-rw-r--r--kubernetes/common/cassandra/templates/statefulset.yaml9
2 files changed, 22 insertions, 1 deletions
diff --git a/kubernetes/common/cassandra/templates/configmap.yaml b/kubernetes/common/cassandra/templates/configmap.yaml
index a9420d7e5b..abb8a7e65f 100644
--- a/kubernetes/common/cassandra/templates/configmap.yaml
+++ b/kubernetes/common/cassandra/templates/configmap.yaml
@@ -12,4 +12,16 @@ metadata:
data:
{{ toYaml .Values.configOverrides | indent 2 }}
{{- end }}
-
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-entrypoint
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/docker-entrypoint.sh").AsConfig . | indent 2 }}
diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index a0b6b5f738..0c7a112bcb 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -54,6 +54,9 @@ spec:
- name: localtime
mountPath: /etc/localtime
readOnly: true
+ - name: cassandra-entrypoint
+ mountPath: /docker-entrypoint.sh
+ subPath: docker-entrypoint.sh
{{- range $key, $value := .Values.configOverrides }}
- name: cassandra-config-{{ $key | replace "." "-" }}
mountPath: /etc/cassandra/{{ $key }}
@@ -110,6 +113,8 @@ spec:
value: {{ default "true" .Values.config.start_rpc | quote }}
- name: CASSANDRA_ENDPOINT_SNITCH
value: {{ default "GossipingPropertyFileSnitch" .Values.config.endpoint_snitch | quote }}
+ - name: CASSANDRA_AUTHENTICATOR
+ value: {{ default "PasswordAuthenticator" .Values.config.authenticator | quote }}
- name: POD_IP
valueFrom:
fieldRef:
@@ -141,6 +146,10 @@ spec:
configMap:
name: {{ include "common.fullname" . }}-configOverrides
{{- end }}
+ - name: cassandra-entrypoint
+ configMap:
+ name: {{ include "common.fullname" . }}-entrypoint
+ defaultMode: 0755
{{- if not .Values.persistence.enabled }}
- name: cassandra-data
emptyDir: {}