From c00f76b5615c3f7eeaa9fb859c64e82fe7e4210e Mon Sep 17 00:00:00 2001
From: Vishal <vishal-biyani@users.noreply.github.com>
Date: Thu, 1 Feb 2018 00:33:15 +0530
Subject: [PATCH] Fix fluentd image tag issue in tests - an additional tag was
 appended (#469)

---
 charts/fission-all/templates/deployment.yaml | 2 +-
 charts/fission-all/values.yaml               | 1 +
 test/test_utils.sh                           | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml
index 656aa454..ad22dfad 100644
--- a/charts/fission-all/templates/deployment.yaml
+++ b/charts/fission-all/templates/deployment.yaml
@@ -309,7 +309,7 @@ spec:
     spec:
       containers:
         - name: fluentd
-          image: "{{ .Values.logger.fluentdImage }}:{{ .Values.imageTag }}"
+          image: "{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           env:
             - name: INFLUXDB_ADDRESS
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 89e38f30..11536b6f 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -42,6 +42,7 @@ builderNamespace: fission-builder
 logger:
   influxdbAdmin: "admin"
   fluentdImage: fission/fluentd
+  fluentdImageTag: 0.4.1
 
 ## Message queue trigger config
 ### NATS Streaming
diff --git a/test/test_utils.sh b/test/test_utils.sh
index b0415283..195669a3 100755
--- a/test/test_utils.sh
+++ b/test/test_utils.sh
@@ -161,11 +161,12 @@ helm_install_fission() {
     controllerNodeport=$6
     routerNodeport=$7
     fluentdImage=$8
+    fluentdImageTag=$9
 
     ns=f-$id
     fns=f-func-$id
 
-    helmVars=image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage
+    helmVars=image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag
 
     timeout 30 bash -c "helm_setup"
 
@@ -376,7 +377,7 @@ install_and_test() {
 
     id=$(generate_test_id)
     trap "helm_uninstall_fission $id" EXIT
-    if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage:$fluentdImageTag
+    if ! helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag
     then
 	dump_logs $id
 	exit 1