Add fluentd.conf as a configmap (#792)

Logger's - FluentD config can be passed as a configmap so that user can customize the configuration to their needs
2019-01-10 17:39:22 +05:30
parent 0651291e2d
commit 16efdaa25c
6 changed files with 148 additions and 59 deletions
@@ -448,65 +448,6 @@ spec:
 ---
 {{- end }}
 apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: logger
-  labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-spec:
-  template:
-    metadata:
-      labels:
-        svc: logger
-    spec:
-      containers:
-        - name: fluentd
-          image: "{{ .Values.repository }}/{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}"
-          imagePullPolicy: {{ .Values.pullPolicy }}
-          env:
-            - name: INFLUXDB_ADDRESS
-              value: influxdb
-            - name: INFLUXDB_PORT
-              value: "8086"
-            - name: INFLUXDB_DBNAME
-              value: "fissionFunctionLog"
-            - name: INFLUXDB_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: influxdb
-                  key: username
-            - name: INFLUXDB_PASSWD
-              valueFrom:
-                secretKeyRef:
-                  name: influxdb
-                  key: password
-            - name: FLUENTD_PATH
-              value: /var/log/containers/*{{.Values.functionNamespace}}*.log
-          volumeMounts:
-            - name: container-log
-              mountPath: /var/log/
-              readOnly: true
-            - name: docker-log
-              mountPath: /var/lib/docker/containers
-              readOnly: true
-            - name: fission-log
-              mountPath: /var/log/fission
-              readOnly: false
-      serviceAccount: fission-svc
-      volumes:
-        - name: container-log
-          hostPath:
-              path: /var/log/
-        - name: docker-log
-          hostPath:
-              path: /var/lib/docker/containers
-        - name: fission-log
-          hostPath:
-              path: /var/log/fission
-  updateStrategy:
-    type: RollingUpdate
---
-apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
  name: timer