From 416a3b5caef093ef0e58f7d7366a1caae3fbad46 Mon Sep 17 00:00:00 2001 From: Frank Reno Date: Wed, 25 Apr 2018 13:05:01 -0600 Subject: [PATCH] only install daemonset if collectorUrl is set (#5235) * only install daemonset if collectorUrl is set as it will not work properly. This will also ensure our tests reliably pass. * bump version and add current appVersion * use test values the use fake URL but exclude paths from processing to prevent errors. --- stable/sumologic-fluentd/Chart.yaml | 3 ++- stable/sumologic-fluentd/ci/no-url-values.yaml | 3 +++ stable/sumologic-fluentd/templates/daemonset.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 stable/sumologic-fluentd/ci/no-url-values.yaml diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml index 84da932a1d..24ec5c3d94 100755 --- a/stable/sumologic-fluentd/Chart.yaml +++ b/stable/sumologic-fluentd/Chart.yaml @@ -1,5 +1,6 @@ name: sumologic-fluentd -version: 0.3.1 +version: 0.3.2 +appVersion: v1.6 description: Sumologic Log Collector keywords: - monitoring diff --git a/stable/sumologic-fluentd/ci/no-url-values.yaml b/stable/sumologic-fluentd/ci/no-url-values.yaml new file mode 100644 index 0000000000..1aff92e9a9 --- /dev/null +++ b/stable/sumologic-fluentd/ci/no-url-values.yaml @@ -0,0 +1,3 @@ +sumologic: + collectorUrl: https://endpoint1.collection.us2.sumologic.com/receiver/v1/http/1234 + excludePath: "[\"/mnt/log/*.log\", \"/var/log/*.log\", \"/mnt/log/*/*.log\"]" \ No newline at end of file diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml index 98baccb7a1..164816ab54 100644 --- a/stable/sumologic-fluentd/templates/daemonset.yaml +++ b/stable/sumologic-fluentd/templates/daemonset.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sumologic.collectorUrl -}} # Sumologic collector URL is required apiVersion: extensions/v1beta1 kind: DaemonSet @@ -190,3 +191,4 @@ spec: {{- end }} updateStrategy: type: "{{ .Values.updateStrategy }}" +{{- end }}