Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add override flag to the ingress template"
[oom.git]
/
kubernetes
/
common
/
cassandra
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/common/cassandra/templates/statefulset.yaml
b/kubernetes/common/cassandra/templates/statefulset.yaml
index
0c7a112
..
2f262ca
100644
(file)
--- a/
kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/
kubernetes/common/cassandra/templates/statefulset.yaml
@@
-20,13
+20,13
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
selector:
matchLabels:
app: {{ include "common.name" . }}
heritage: {{ .Release.Service }}
spec:
selector:
matchLabels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
serviceName: {{ include "common.servicename" . }}
replicas: {{ .Values.replicaCount }}
podManagementPolicy: {{ .Values.podManagementPolicy }}
serviceName: {{ include "common.servicename" . }}
replicas: {{ .Values.replicaCount }}
podManagementPolicy: {{ .Values.podManagementPolicy }}
@@
-36,7
+36,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
name: {{ include "common.name" . }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
name: {{ include "common.name" . }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
@@
-49,7
+49,7
@@
spec:
- containerPort: {{ $ports.port }}
{{- end }}
volumeMounts:
- containerPort: {{ $ports.port }}
{{- end }}
volumeMounts:
- - name:
cassandra
-data
+ - name:
{{ include "common.fullname" . }}
-data
mountPath: /var/lib/cassandra
- name: localtime
mountPath: /etc/localtime
mountPath: /var/lib/cassandra
- name: localtime
mountPath: /etc/localtime
@@
-74,7
+74,7
@@
spec:
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
successThreshold: {{ .Values.liveness.successThreshold }}
failureThreshold: {{ .Values.liveness.failureThreshold }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
successThreshold: {{ .Values.liveness.successThreshold }}
failureThreshold: {{ .Values.liveness.failureThreshold }}
- {{ end
-
}}
+ {{ end }}
readinessProbe:
exec:
command:
readinessProbe:
exec:
command:
@@
-115,6
+115,14
@@
spec:
value: {{ default "GossipingPropertyFileSnitch" .Values.config.endpoint_snitch | quote }}
- name: CASSANDRA_AUTHENTICATOR
value: {{ default "PasswordAuthenticator" .Values.config.authenticator | quote }}
value: {{ default "GossipingPropertyFileSnitch" .Values.config.endpoint_snitch | quote }}
- name: CASSANDRA_AUTHENTICATOR
value: {{ default "PasswordAuthenticator" .Values.config.authenticator | quote }}
+ {{- if (include "common.serviceMesh" .) }}
+ - name: CASSANDRA_LISTEN_ADDRESS
+ value: "127.0.0.1"
+ - name: CASSANDRA_BROADCAST_ADDRESS
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ {{- end }}
- name: POD_IP
valueFrom:
fieldRef:
- name: POD_IP
valueFrom:
fieldRef:
@@
-151,25
+159,26
@@
spec:
name: {{ include "common.fullname" . }}-entrypoint
defaultMode: 0755
{{- if not .Values.persistence.enabled }}
name: {{ include "common.fullname" . }}-entrypoint
defaultMode: 0755
{{- if not .Values.persistence.enabled }}
- - name:
cassandra
-data
+ - name:
{{ include "common.fullname" . }}
-data
emptyDir: {}
{{- else }}
volumeClaimTemplates:
- metadata:
emptyDir: {}
{{- else }}
volumeClaimTemplates:
- metadata:
- name:
cassandra
-data
+ name:
{{ include "common.fullname" . }}
-data
labels:
labels:
- app: {{ template "common.fullname" . }}
- release: "{{ .Release.Name }}"
+ name: {{ include "common.fullname" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ include "common.release" . }}"
heritage: "{{ .Release.Service }}"
heritage: "{{ .Release.Service }}"
- annotations:
- volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
spec:
accessModes:
spec:
accessModes:
- - {{ .Values.persistence.accessMode | quote }}
+ {{- if .Values.backup.enabled }}
+ - ReadWriteMany
+ {{- else }}
+ - ReadWriteOnce
+ {{- end }}
+ storageClassName: {{ include "common.storageClass" . }}
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
- selector:
- matchLabels:
- release: "{{ .Release.Name }}"
{{- end }}
{{- end }}