diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-18 14:55:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-18 14:55:42 +0000 |
| commit | 46cf1ba1626145d38cf6ba2dc41690a6936a5ee4 (patch) | |
| tree | 3d184dabc381975cb4585aec39511cf3a89ba3a8 /charts/aai-champ/templates/deployment.yaml | |
| parent | 8b52fa35261775ada62c127d15fceaead9063274 (diff) | |
| parent | 5ceee5a519fb6214646b997c42cdad6efb4c75df (diff) | |
Merge "[Champ] Update to use DMaaP with SSL"
Diffstat (limited to 'charts/aai-champ/templates/deployment.yaml')
| -rw-r--r-- | charts/aai-champ/templates/deployment.yaml | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/charts/aai-champ/templates/deployment.yaml b/charts/aai-champ/templates/deployment.yaml index 0e2bb90..d2f7bca 100644 --- a/charts/aai-champ/templates/deployment.yaml +++ b/charts/aai-champ/templates/deployment.yaml @@ -31,23 +31,6 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: - initContainers: - - command: - - /root/ready.py - args: - - --container-name - - aai-resources - - --container-name - - message-router-kafka - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" @@ -100,7 +83,7 @@ spec: - mountPath: /opt/app/champ-service/bundleconfig/etc/logback.xml name: {{ include "common.fullname" . }}-logback-config subPath: logback.xml - - mountPath: /logs + - mountPath: /var/log/onap name: {{ include "common.fullname" . }}-logs resources: {{ toYaml .Values.resources | indent 12 }} @@ -113,6 +96,19 @@ spec: {{ toYaml .Values.affinity | indent 10 }} {{- end }} + # side car containers + - name: filebeat-onap + image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml + name: filebeat-conf + - mountPath: /var/log/onap + name: {{ include "common.fullname" . }}-logs + - mountPath: /usr/share/filebeat/data + name: aai-filebeat + volumes: - name: localtime hostPath: @@ -140,5 +136,10 @@ spec: items: - key: logback.xml path: logback.xml + - name: filebeat-conf + configMap: + name: aai-filebeat + - name: aai-filebeat + emptyDir: {} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |