Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #985: add correct clusterroles for knative in global mode #1019

Merged
merged 1 commit into from
Oct 18, 2019
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
6 changes: 3 additions & 3 deletions pkg/install/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func OperatorOrCollect(ctx context.Context, c client.Client, cfg OperatorConfigu
return err
}
if isKnative {
return installKnative(ctx, c, cfg.Namespace, collection)
return installKnative(ctx, c, cfg.Namespace, customizer, collection)
}
return nil
}
Expand All @@ -145,8 +145,8 @@ func installKubernetes(ctx context.Context, c client.Client, namespace string, c
)
}

func installKnative(ctx context.Context, c client.Client, namespace string, collection *kubernetes.Collection) error {
return ResourcesOrCollect(ctx, c, namespace, collection, IdentityResourceCustomizer,
func installKnative(ctx context.Context, c client.Client, namespace string, customizer ResourceCustomizer, collection *kubernetes.Collection) error {
return ResourcesOrCollect(ctx, c, namespace, collection, customizer,
"operator-role-knative.yaml",
"operator-role-binding-knative.yaml",
)
Expand Down