Merge pull request #93 from jchauncey/extend-chart-values

feat(chart): Extend values.yaml file
deis · May 1, 2017 · cb38ca2 · cb38ca2
2 parents d87629a + c515df3
commit cb38ca2
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/charts/fluentd/templates/logger-fluentd-daemon.yaml b/charts/fluentd/templates/logger-fluentd-daemon.yaml
@@ -34,12 +34,48 @@ spec:
 {{- end}}
 {{- end}}
         env:
+          {{- if .Values.sources.start_script }}
+          - name: "CAPTURE_START_SCRIPT"
+            value: {{.Values.sources.start_script | quote }}
+          {{- end }}
+          {{- if .Values.sources.docker }}
+          - name: "CAPTURE_DOCKER_LOG"
+            value: {{.Values.sources.docker | quote }}
+          {{- end }}
+          {{- if .Values.sources.etcd }}
+          - name: "CAPTURE_ETCD_LOG"
+            value: {{.Values.sources.etcd | quote }}
+          {{- end }}
+          {{- if .Values.sources.kubelet }}
+          - name: "CAPTURE_KUBELET_LOG"
+            value: {{.Values.sources.kubelet | quote }}
+          {{- end }}
+          {{- if .Values.sources.kube_api }}
+          - name: "CAPTURE_KUBE_API_LOG"
+            value: {{.Values.sources.kube_api | quote }}
+          {{- end }}
+          {{- if .Values.sources.controller }}
+          - name: "CAPTURE_CONTROLLER_LOG"
+            value: {{.Values.sources.controller | quote }}
+          {{- end }}
+          {{- if .Values.sources.scheduler }}
+          - name: "CAPTURE_SCHEDULER_LOG"
+            value: {{.Values.sources.scheduler | quote }}
+          {{- end }}
+          {{- if .Values.output.disable_deis }}
+          - name: "DISABLE_DEIS_OUTPUT"
+            value: {{.Values.output.disable_deis | quote }}
+          {{- end }}
+          {{- if .Values.boot.install_build_tools }}
+          - name: "INSTALL_BUILD_TOOLS"
+            value: {{.Values.boot.install_build_tools | quote }}
+          {{- end }}
           {{- if and (.Values.syslog.host) (.Values.syslog.port)}}
           - name: "SYSLOG_HOST"
             value: {{.Values.syslog.host | quote }}
           - name: "SYSLOG_PORT"
             value: {{.Values.syslog.port | quote }}
-          {{- end}}
+          {{- end }}
           {{- range $key, $value := .Values.daemon_environment }}
           - name: {{ $key }}
             value: {{ $value | quote }}

diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
@@ -9,6 +9,21 @@ syslog:
   host: "" # external syslog endpoint url
   port: "" # external syslog endpoint port
 
+sources:
+  start_script: false
+  docker: false
+  etcd: false
+  kubelet: false
+  kube_api: false
+  controller: false
+  scheduler: false
+
+output:
+  disable_deis: false
+
+boot:
+  install_build_tools: false
+
 # Any custom fluentd environment variables (https://github.com/deis/fluentd#configuration)
 # can be specified as key-value pairs under daemon_environment.
 daemon_environment: