aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2022-02-22 16:04:21 +0000
committerGerrit Code Review <gerrit@onap.org>2022-02-22 16:04:21 +0000
commitc7da566a122b31a5f049a74338d91d6b67612ef9 (patch)
treefd385771135df47766abdf1202c790fc03a9356f
parentadbc2b7113e015d2ed6070a76f53ed1c6c0ee4b3 (diff)
parent128e9d2214c5a41a0ca4a9dac4248c55b38c59d0 (diff)
Merge "[DMAAP] Fix log volume name in some components"
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml4
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index 84a3c1eee8..2bfa496bcd 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@ -79,7 +79,7 @@ spec:
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
- mountPath: {{ .Values.global.loggingDirectory }}
- name: {{ include "common.fullname" . }}-logs
+ name: logs
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
@@ -106,7 +106,7 @@ spec:
configMap:
name: {{ include "common.fullname" . }}-log
{{ include "common.log.volumes" . | nindent 8 }}
- - name: {{ include "common.fullname" . }}-logs
+ - name: logs
emptyDir: {}
{{- if not .Values.persistence.enabled }}
- name: {{ include "common.fullname" . }}-event-logs
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index 5f99ea3399..b7acbc9d8d 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -95,7 +95,7 @@ spec:
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
- mountPath: {{ .Values.global.loggingDirectory }}
- name: {{ include "common.fullname" . }}-logs
+ name: logs
resources:
{{ include "common.resources" . }}
{{- if .Values.nodeSelector }}
@@ -123,7 +123,7 @@ spec:
configMap:
name: {{ include "common.fullname" . }}-log
{{ include "common.log.volumes" . | nindent 6 }}
- - name: {{ include "common.fullname" . }}-logs
+ - name: logs
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"