From b5d3baa5be342b13ddcbc43edcafbc1002b61982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 2 Apr 2026 13:15:11 +0200 Subject: [PATCH] Remove hardcoded s2i builder --- internal/controller/function_controller.go | 1 - internal/controller/function_controller_test.go | 1 - internal/funccli/manager.go | 3 --- 3 files changed, 5 deletions(-) diff --git a/internal/controller/function_controller.go b/internal/controller/function_controller.go index 8828091..779e688 100644 --- a/internal/controller/function_controller.go +++ b/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 != "" { diff --git a/internal/controller/function_controller_test.go b/internal/controller/function_controller_test.go index 325e527..9e7409b 100644 --- a/internal/controller/function_controller_test.go +++ b/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) diff --git a/internal/funccli/manager.go b/internal/funccli/manager.go index 107e486..1b9e2bd 100644 --- a/internal/funccli/manager.go +++ b/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 != "" {