From 06aa0789cf8b904f1bf9a7557c96749e14754cce Mon Sep 17 00:00:00 2001
From: roi-codefresh <60569147+roi-codefresh@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:33:35 +0300
Subject: [PATCH] Bump argocd (#44)

---
 Makefile                             |  2 +-
 docs/releases/release_notes.md       |  4 ++--
 manifests/argo-cd/default-rbac.yaml  | 13 ++++++-------
 manifests/argo-cd/kustomization.yaml |  2 +-
 manifests/runtime.yaml               |  2 +-
 pkg/util/events/util.go              |  4 +---
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 7511fe367..83ea4ec9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.48
+VERSION=v0.0.49
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
index b4fd49d2b..2d1992340 100644
--- a/docs/releases/release_notes.md
+++ b/docs/releases/release_notes.md
@@ -8,7 +8,7 @@
 ### Linux
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.48/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.49/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -20,7 +20,7 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.48/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.49/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/manifests/argo-cd/default-rbac.yaml b/manifests/argo-cd/default-rbac.yaml
index e877f382b..fac753869 100644
--- a/manifests/argo-cd/default-rbac.yaml
+++ b/manifests/argo-cd/default-rbac.yaml
@@ -3,13 +3,12 @@ kind: Role
 metadata:
   name: codefresh-cm-reader
 rules:
-- apiGroups: [""]
-  resources: ["configmaps"]
-  resourceNames: ["codefresh-cm"]
-  verbs: ["get"]
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    resourceNames: ["codefresh-cm"]
+    verbs: ["get"]
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -17,7 +16,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: codefresh
+  name: codefresh-cm-reader
 subjects:
   - kind: ServiceAccount
-    name: default
\ No newline at end of file
+    name: default
diff --git a/manifests/argo-cd/kustomization.yaml b/manifests/argo-cd/kustomization.yaml
index 8c645da85..72c758afa 100644
--- a/manifests/argo-cd/kustomization.yaml
+++ b/manifests/argo-cd/kustomization.yaml
@@ -7,7 +7,7 @@ resources:
 images:
   - name: quay.io/argoproj/argocd
     newName: quay.io/codefresh/argocd
-    newTag: v2.1.0-rc1
+    newTag: v2.1.0-rc2
 
 # will be effective on argo-cd 2.1
 configMapGenerator:
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
index 2916048c7..11a31381a 100644
--- a/manifests/runtime.yaml
+++ b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.48
+  version: 0.0.49
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/util/events/util.go b/pkg/util/events/util.go
index 7c233843a..a89c88c06 100644
--- a/pkg/util/events/util.go
+++ b/pkg/util/events/util.go
@@ -124,9 +124,7 @@ func CreateEventSource(opts *CreateEventSourceOptions) *eventsourcev1alpha1.Even
 			},
 		},
 		Spec: eventsourcev1alpha1.EventSourceSpec{
-			Template: &eventsourcev1alpha1.Template{
-				ServiceAccountName: opts.ServiceAccountName,
-			},
+			Template:     tpl,
 			EventBusName: opts.EventBusName,
 			Resource:     resource,
 			Generic:      generic,