From 1ff575fceb1fe1399142be990680be61a801a583 Mon Sep 17 00:00:00 2001
From: Guilherme Garnier <guilherme.garnier@gmail.com>
Date: Wed, 27 Jun 2018 14:31:21 -0300
Subject: [PATCH] [stable/eventrouter] allow sink configuration (#6360)

* Allow configuring the sink

* Set namespace for deployment, serviceaccount and configmap

* [stable/eventrouter] Release 0.1.1
---
 stable/eventrouter/Chart.yaml                    | 2 +-
 stable/eventrouter/README.md                     | 3 ++-
 stable/eventrouter/templates/configmap.yaml      | 7 ++++---
 stable/eventrouter/templates/deployment.yaml     | 5 +++--
 stable/eventrouter/templates/serviceaccount.yaml | 1 +
 stable/eventrouter/values.yaml                   | 2 ++
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/stable/eventrouter/Chart.yaml b/stable/eventrouter/Chart.yaml
index 005efabb3c..e2b900b1c7 100644
--- a/stable/eventrouter/Chart.yaml
+++ b/stable/eventrouter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for eventruter (https://github.com/heptiolabs/eventrouter)
 name: eventrouter
-version: 0.1.0
+version: 0.1.1
 appVersion: 0.2
 home: https://github.com/heptiolabs/eventrouter
 sources:
diff --git a/stable/eventrouter/README.md b/stable/eventrouter/README.md
index 727f3dfa21..a593533b7d 100644
--- a/stable/eventrouter/README.md
+++ b/stable/eventrouter/README.md
@@ -21,4 +21,5 @@ The following table lists the configurable parameters of the eventrouter chart a
 | `serviceAccount.name`   | Service account to be used. If not set and serviceAccount.create is `true`, a name is generated using the fullname template | ``                                 |
 | `serviceAccount.create` | If true, create a new service account                                                                                       | `true`                             |
 | `tolerations`           | List of node taints to tolerate                                                                                             | `[]`                               |
-| `nodeSelector`          | node labels for pod assignment                                                                                              | `{}`                               |
+| `nodeSelector`          | Node labels for pod assignment                                                                                              | `{}`                               |
+| `sink`                  | Sink to send the events to                                                                                                  | `glog`                             |
diff --git a/stable/eventrouter/templates/configmap.yaml b/stable/eventrouter/templates/configmap.yaml
index dce8617a74..f748bf71ef 100644
--- a/stable/eventrouter/templates/configmap.yaml
+++ b/stable/eventrouter/templates/configmap.yaml
@@ -3,10 +3,11 @@ kind: ConfigMap
 metadata:
   name: {{ template "eventrouter.fullname" . }}
   labels: {{ include "eventrouter.labels" . | indent 4 }}
+  namespace: {{ .Release.Namespace }}
 data:
 apiVersion: v1
 data:
-  config.json: |- 
+  config.json: |-
     {
-      "sink": "glog"
-    }
\ No newline at end of file
+      "sink": {{ .Values.sink }}
+    }
diff --git a/stable/eventrouter/templates/deployment.yaml b/stable/eventrouter/templates/deployment.yaml
index db83615c0a..61769f4a75 100644
--- a/stable/eventrouter/templates/deployment.yaml
+++ b/stable/eventrouter/templates/deployment.yaml
@@ -3,17 +3,18 @@ kind: Deployment
 metadata:
   labels: {{ include "eventrouter.labels" . | indent 4 }}
   name: {{ template "eventrouter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app: {{ template "eventrouter.name" . }}
-      release: {{ .Release.Name }}    
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
         app: {{ template "eventrouter.name" . }}
-        release: {{ .Release.Name }}    
+        release: {{ .Release.Name }}
     spec:
       containers:
       - name: {{ .Chart.Name }}
diff --git a/stable/eventrouter/templates/serviceaccount.yaml b/stable/eventrouter/templates/serviceaccount.yaml
index 84b5ddda58..1660fabdc6 100644
--- a/stable/eventrouter/templates/serviceaccount.yaml
+++ b/stable/eventrouter/templates/serviceaccount.yaml
@@ -4,4 +4,5 @@ kind: ServiceAccount
 metadata:
   labels: {{ include "eventrouter.labels" . | indent 4 }}
   name: {{ template "eventrouter.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/stable/eventrouter/values.yaml b/stable/eventrouter/values.yaml
index 21e206ecad..16d9cc046f 100644
--- a/stable/eventrouter/values.yaml
+++ b/stable/eventrouter/values.yaml
@@ -26,3 +26,5 @@ rbac:
 tolerations: []
 
 nodeSelector: {}
+
+sink: glog