Skip to content

Commit 9b77437

Browse files
author
Eric Stroczynski
authored
test/integration: use default service account for CSV perms (#3668)
1 parent 8bca020 commit 9b77437

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

test/integration/integration_helpers.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ type CSVTemplateConfig struct {
5858
IsBundle bool
5959
}
6060

61+
// TODO(estroz): devise a way for "make bundle" to be called, then update the generated bundle with correct
62+
// install modes within integration tests themselves.
63+
6164
const csvTmpl = `apiVersion: operators.coreos.com/v1alpha1
6265
kind: ClusterServiceVersion
6366
metadata:
@@ -104,7 +107,7 @@ spec:
104107
- patch
105108
- update
106109
{{- end}}
107-
serviceAccountName: {{ .OperatorName }}-manager-role
110+
serviceAccountName: default
108111
- rules:
109112
- apiGroups:
110113
- authentication.k8s.io
@@ -118,13 +121,7 @@ spec:
118121
- subjectaccessreviews
119122
verbs:
120123
- create
121-
serviceAccountName: {{ .OperatorName }}-proxy-role
122-
- rules:
123-
- nonResourceURLs:
124-
- /metrics
125-
verbs:
126-
- get
127-
serviceAccountName: {{ .OperatorName }}-metrics-reader
124+
serviceAccountName: default
128125
deployments:
129126
- name: {{ .OperatorName }}-controller-manager
130127
spec:
@@ -186,7 +183,7 @@ spec:
186183
verbs:
187184
- create
188185
- patch
189-
serviceAccountName: {{ .OperatorName }}-leader-election-role
186+
serviceAccountName: default
190187
strategy: deployment
191188
installModes:
192189
{{- range $i, $mode := .InstallModes }}

0 commit comments

Comments
 (0)