Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix for filebeat
[oom.git]
/
kubernetes
/
dmaap
/
components
/
dmaap-dr-prov
/
templates
/
deployment.yaml
diff --git
a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index
573e90c
..
b9c144d
100644
(file)
--- a/
kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/
kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@
-69,10
+69,13
@@
spec:
name: localtime
readOnly: false
- mountPath: /opt/app/datartr/etc/provserver.properties
name: localtime
readOnly: false
- mountPath: /opt/app/datartr/etc/provserver.properties
+ name: {{ include "common.fullname" . }}-config
subPath: provserver.properties
subPath: provserver.properties
- name: prov-props
- - name: {{ include "common.fullname" . }}-logs
- mountPath: {{ .Values.global.loggingDirectory }}
+ - mountPath: /opt/app/datartr/etc/drProvCadi.properties
+ name: {{ include "common.fullname" . }}-config
+ subPath: drProvCadi.properties
+ - mountPath: {{ .Values.global.loggingDirectory }}
+ name: {{ include "common.fullname" . }}-logs
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@
-84,7
+87,7
@@
spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
# Filebeat sidecar container
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
# Filebeat sidecar container
- - name: {{ include "common.
full
name" . }}-filebeat-onap
+ - name: {{ include "common.name" . }}-filebeat-onap
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
@@
-99,15
+102,20
@@
spec:
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime
- - name:
prov-props
+ - name:
{{ include "common.fullname" . }}-config
configMap:
configMap:
- name: {{ include "common.fullname" . }}-prov-props-configmap
+ name: {{ include "common.fullname" . }}-configmap
+ items:
+ - key: provserver.properties
+ path: provserver.properties
+ - key: drProvCadi.properties
+ path: drProvCadi.properties
- name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
- name: {{ include "common.fullname" . }}-filebeat-conf
configMap:
- name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
- name: {{ include "common.fullname" . }}-filebeat-conf
configMap:
- name: {{
include "common.fullname" .
}}-dmaap-filebeat-configmap
+ name: {{
.Release.Name
}}-dmaap-filebeat-configmap
- name: {{ include "common.fullname" . }}-data-filebeat
emptyDir: {}
- name: {{ include "common.fullname" . }}-logs
- name: {{ include "common.fullname" . }}-data-filebeat
emptyDir: {}
- name: {{ include "common.fullname" . }}-logs