From 4746e67d47c3236f66376f76c7b68e77531bc0f3 Mon Sep 17 00:00:00 2001
From: Eric Stroczynski <ericstroczynski@gmail.com>
Date: Thu, 6 Aug 2020 15:32:32 -0700
Subject: [PATCH] test/integration: use default service account for CSV perms

---
 test/integration/integration_helpers.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/integration/integration_helpers.go b/test/integration/integration_helpers.go
index b6d85b17d7..6fbd602041 100644
--- a/test/integration/integration_helpers.go
+++ b/test/integration/integration_helpers.go
@@ -58,6 +58,9 @@ type CSVTemplateConfig struct {
 	IsBundle bool
 }
 
+// TODO(estroz): devise a way for "make bundle" to be called, then update the generated bundle with correct
+// install modes within integration tests themselves.
+
 const csvTmpl = `apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
@@ -104,7 +107,7 @@ spec:
           - patch
           - update
         {{- end}}
-        serviceAccountName: {{ .OperatorName }}-manager-role
+        serviceAccountName: default
       - rules:
         - apiGroups:
           - authentication.k8s.io
@@ -118,13 +121,7 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: {{ .OperatorName }}-proxy-role
-      - rules:
-        - nonResourceURLs:
-          - /metrics
-          verbs:
-          - get
-        serviceAccountName: {{ .OperatorName }}-metrics-reader
+        serviceAccountName: default
       deployments:
       - name: {{ .OperatorName }}-controller-manager
         spec:
@@ -186,7 +183,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: {{ .OperatorName }}-leader-election-role
+        serviceAccountName: default
     strategy: deployment
   installModes:
 {{- range $i, $mode := .InstallModes }}