Skip to content

Commit

Permalink
test/integration: use default service account for CSV perms (#3668)
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Stroczynski authored Aug 7, 2020
1 parent 8bca020 commit 9b77437
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions test/integration/integration_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -104,7 +107,7 @@ spec:
- patch
- update
{{- end}}
serviceAccountName: {{ .OperatorName }}-manager-role
serviceAccountName: default
- rules:
- apiGroups:
- authentication.k8s.io
Expand All @@ -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:
Expand Down Expand Up @@ -186,7 +183,7 @@ spec:
verbs:
- create
- patch
serviceAccountName: {{ .OperatorName }}-leader-election-role
serviceAccountName: default
strategy: deployment
installModes:
{{- range $i, $mode := .InstallModes }}
Expand Down

0 comments on commit 9b77437

Please sign in to comment.