Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fluentd image tag issue in tests - an additional tag was appended (#469)

Browse Source
This commit is contained in:
Vishal
2018-02-01 03:03:15 +08:00
committed by Ta-Ching Chen
parent 91094cf659
commit c00f76b561
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/fission-all/templates/deployment.yaml
+1 -1
View File
@@ -309,7 +309,7 @@ spec:
spec: spec:
containers: containers:
- name: fluentd - name: fluentd
image: "{{ .Values.logger.fluentdImage }}:{{ .Values.imageTag }}" image: "{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}"
imagePullPolicy: {{ .Values.pullPolicy }} imagePullPolicy: {{ .Values.pullPolicy }}
env: env:
- name: INFLUXDB_ADDRESS - name: INFLUXDB_ADDRESS
charts/fission-all/values.yaml
+1
View File
@@ -42,6 +42,7 @@ builderNamespace: fission-builder
logger: logger:
influxdbAdmin: "admin" influxdbAdmin: "admin"
fluentdImage: fission/fluentd fluentdImage: fission/fluentd
fluentdImageTag: 0.4.1
## Message queue trigger config ## Message queue trigger config
### NATS Streaming ### NATS Streaming
test/test_utils.sh
+3 -2
View File
@@ -161,11 +161,12 @@ helm_install_fission() {
controllerNodeport=$6 controllerNodeport=$6
routerNodeport=$7 routerNodeport=$7
fluentdImage=$8 fluentdImage=$8
fluentdImageTag=$9
ns=f-$id ns=f-$id
fns=f-func-$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" timeout 30 bash -c "helm_setup"
@@ -376,7 +377,7 @@ install_and_test() {
id=$(generate_test_id) id=$(generate_test_id)
trap "helm_uninstall_fission $id" EXIT 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 then
dump_logs $id dump_logs $id
exit 1 exit 1