From eca035f30c7b96845ce64240c7492253c73f2ca7 Mon Sep 17 00:00:00 2001
From: erwinvaneyk <erwinvaneyk@gmail.com>
Date: Mon, 15 Oct 2018 20:39:17 +0200
Subject: [PATCH] Minor fixes to default values of charts and build scripts

---
 Makefile                                           |  2 +-
 build/build.sh                                     |  2 +-
 charts/fission-workflows/templates/deployment.yaml |  2 --
 charts/fission-workflows/values.yaml               |  2 +-
 examples/workflows-env.yaml                        | 12 +++++-------
 hack/codegen-helm.sh                               |  2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 55608413..04456c67 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ build fission-workflows fission-workflows-bundle fission-workflows-proxy:
 	# TODO toggle between container and local build, support parameters, seperate cli and bundle
 	build/build.sh
 
-generate: ${PROTO_TARGETS} pkg/version/version.gen.go examples/workflows-env.yaml pkg/api/events/events.gen.go
+generate: ${PROTO_TARGETS} examples/workflows-env.yaml pkg/api/events/events.gen.go
 
 prepush: generate verify test
 
diff --git a/build/build.sh b/build/build.sh
index fa9cc963..806e2b58 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]]; do
       output_cli=$2
       shift
       ;;
-    --output-cli)
+    --output-proxy)
       output_proxy=$2
       shift
       ;;
diff --git a/charts/fission-workflows/templates/deployment.yaml b/charts/fission-workflows/templates/deployment.yaml
index 68e06c4c..3e175cdf 100644
--- a/charts/fission-workflows/templates/deployment.yaml
+++ b/charts/fission-workflows/templates/deployment.yaml
@@ -113,9 +113,7 @@ spec:
     targetPort: 5555
     protocol: TCP
 ---
-#
 # Fission integration
-#
 apiVersion: fission.io/v1
 kind: Environment
 metadata:
diff --git a/charts/fission-workflows/values.yaml b/charts/fission-workflows/values.yaml
index 8dde4a2c..a06b7851 100644
--- a/charts/fission-workflows/values.yaml
+++ b/charts/fission-workflows/values.yaml
@@ -33,7 +33,7 @@ fission:
   env:
     name: workflow
     ns: default
-    runtimeImage: fission/fission-workflows-proxy
+    runtimeImage: fission/workflows-proxy
     builderImage: fission/workflow-build-env
 
 # Tracing-related configuration
diff --git a/examples/workflows-env.yaml b/examples/workflows-env.yaml
index 0dd7b41f..68348eb4 100644
--- a/examples/workflows-env.yaml
+++ b/examples/workflows-env.yaml
@@ -5,7 +5,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: workflows
-  namespace: default
+  namespace: fission
   labels:
     chart: "fission-workflows-0.6.0"
 spec:
@@ -62,7 +62,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: workflows
-  namespace: default
+  namespace: fission
   labels:
     svc: workflows
     chart: "fission-workflows-0.6.0"
@@ -86,7 +86,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: workflows-apiserver
-  namespace: default
+  namespace: fission
   labels:
     svc: workflows
     chart: "fission-workflows-0.6.0"
@@ -104,9 +104,7 @@ spec:
     targetPort: 5555
     protocol: TCP
 ---
-#
 # Fission integration
-#
 apiVersion: fission.io/v1
 kind: Environment
 metadata:
@@ -119,13 +117,13 @@ spec:
   TerminationGracePeriod: 5
   allowedFunctionsPerContainer: infinite
   runtime:
-    image: "fission/fission-workflows-proxy:0.6.0"
+    image: "fission/workflows-proxy:0.6.0"
     container:
       command: ["/fission-workflows-proxy"]
       imagePullPolicy: IfNotPresent
       args: [
         "--test",
-        "--target", "workflows.default:5555",
+        "--target", "workflows.fission:5555",
         "--port", "8888",
       ]
   builder:
diff --git a/hack/codegen-helm.sh b/hack/codegen-helm.sh
index 2e5bc02e..c016fb1a 100755
--- a/hack/codegen-helm.sh
+++ b/hack/codegen-helm.sh
@@ -6,6 +6,6 @@ TARGET=examples/workflows-env.yaml
 
 echo '# An Kubernetes example template of a Fission Workflow deployment as an environment in Fission' > ${TARGET}
 
-helm template --set fission.env.name=workflows charts/fission-workflows/ >> ${TARGET}
+helm template --namespace fission --set fission.env.name=workflows charts/fission-workflows/ >> ${TARGET}
 
 echo "Created ${TARGET}"
\ No newline at end of file