Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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