diff --git a/ci/build.sh b/ci/build.sh index 1858671d0d..9ae1e695e5 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -65,12 +65,14 @@ ruby deploy/test/test_docker.rb if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ -n "$GITHUB_TOKEN" ]; then echo "Generating yaml from helm chart..." - # echo "# This file is auto-generated." > deploy/kubernetes/fluentd-sumologic.yaml.tmpl + echo "# This file is auto-generated." > deploy/kubernetes/fluentd-sumologic.yaml.tmpl sudo helm init --client-only cd deploy/helm/sumologic sudo helm dependency update cd ../../../ - # sudo helm template deploy/helm/sumologic --namespace "\$NAMESPACE" --set dryRun=true >> deploy/kubernetes/fluentd-sumologic.yaml.tmpl + + with_files=`ls deploy/helm/sumologic/templates/*.yaml | sed 's#deploy/helm/sumologic/templates#-x templates#g' | sed 's/yaml/yaml \\\/g'` + eval 'sudo helm template deploy/helm/sumologic $with_files --namespace "\$NAMESPACE" --set dryRun=true >> deploy/kubernetes/fluentd-sumologic.yaml.tmpl' if [[ $(git diff deploy/kubernetes/fluentd-sumologic.yaml.tmpl) ]]; then echo "Detected changes in 'fluentd-sumologic.yaml.tmpl', committing the updated version to $TRAVIS_BRANCH..." diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 7183baacf3..4d5b286865 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -110,8 +110,6 @@ sumologic: ## ref: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter#configuration bearerCacheTtl: "3600" -## Add manual changes to this file - ## Configure fluent-bit ## ref: https://github.com/helm/charts/blob/master/stable/fluent-bit/values.yaml fluent-bit: