Remove hardcoded s2i builder

Author: creydr

internal/controller/function_controller.go

@@ -383,7 +383,6 @@ func (r *FunctionReconciler) deploy(ctx context.Context, function *v1alpha1.Func
 		Registry:         function.Spec.Registry.Path,
 		InsecureRegistry: function.Spec.Registry.Insecure,
 		GitUrl:           function.Spec.Source.RepositoryURL,
-		Builder:          "s2i",
 	}
 
 	if function.Spec.Registry.AuthSecretRef != nil && function.Spec.Registry.AuthSecretRef.Name != "" {

internal/controller/function_controller_test.go

@@ -118,7 +118,6 @@ var _ = Describe("Function Controller", func() {
 					funcMock.EXPECT().Deploy(mock.Anything, mock.Anything, resourceNamespace, funccli.DeployOptions{
 						Registry: "quay.io/foo/bar",
 						GitUrl:   "https://github.com/foo/bar",
-						Builder:  "s2i",
 					}).Return(nil)
 
 					gitMock.EXPECT().CloneRepository(mock.Anything, "https://github.com/foo/bar", "my-branch", mock.Anything).Return(createTmpGitRepo(functions.Function{Name: "func-go"}), nil)

internal/funccli/manager.go

@@ -43,8 +43,6 @@ type DeployOptions struct {
 	RegistryAuthFile string
 
 	GitUrl string
-
-	Builder string
 }
 
 var _ Manager = &managerImpl{}
@@ -218,7 +216,6 @@ func (m *managerImpl) Deploy(ctx context.Context, repoPath string, namespace str
 		"--namespace", namespace,
 		"--registry", opts.Registry,
 		"--git-url", opts.GitUrl,
-		"--builder", opts.Builder,
 	}
 
 	if opts.RegistryAuthFile != "" {