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 "[DMAAP] DMaaP ServiceMesh compatibility"
[oom.git]
/
kubernetes
/
aaf
/
components
/
aaf-cass
/
templates
/
deployment.yaml
diff --git
a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
index
4dc508f
..
4e18b3b
100644
(file)
--- a/
kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
+++ b/
kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
@@
-31,13
+31,23
@@
spec:
args:
- -c
- |
args:
- -c
- |
- chown -R 1000:1000 /opt/app/aaf/status
+ echo "*** Move files from configmap to emptyDir"
+ cp -L /config-input-dats/* /config-dats/
+ echo "*** set righ user to the different folders"
+ chown -R 1000:1000 /config-dats
chown -R 1000:1000 /var/lib/cassandra
chown -R 1000:1000 /var/lib/cassandra
+ chown -R 1000:1000 /status
image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /var/lib/cassandra
name: aaf-cass-vol
image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /var/lib/cassandra
name: aaf-cass-vol
+ - mountPath: /config-input-dats
+ name: config-cass-init-dats
+ - mountPath: /config-dats
+ name: config-cass-dats
+ - mountPath: /status
+ name: aaf-status
resources:
limits:
cpu: 100m
resources:
limits:
cpu: 100m
@@
-81,10
+91,10
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/app/aaf/cass_init/data
- name: config-cass-init-data
- mountPath: /opt/app/aaf/cass_init/dats
- mountPath: /opt/app/aaf/cass_init/dats
- name: config-cass-init-dats
+ name: config-cass-dats
+ - mountPath: /opt/app/aaf/status
+ name: aaf-status
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
@@
-108,6
+118,8
@@
spec:
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime
+ - name: aaf-status
+ emptyDir: {}
- name: aaf-cass-vol
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
- name: aaf-cass-vol
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
@@
-118,8
+130,7
@@
spec:
- name: config-cass-init-dats
configMap:
name: {{ include "common.fullname" . }}-cass-init-dats
- name: config-cass-init-dats
configMap:
name: {{ include "common.fullname" . }}-cass-init-dats
- - name: config-cass-init-data
- configMap:
- name: {{ include "common.fullname" . }}-cass-init-data
+ - name: config-cass-dats
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"