Skip to content

Remove hardcoded s2i builder #34

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.

Sign up for GitHub

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

Closed
creydr wants to merge 2 commits into from
Closed

Remove hardcoded s2i builder #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d3baa
Remove hardcoded s2i builder
creydr Apr 2, 2026
a60d015
Merge branch 'main' into use-builder-from-func-config
creydr Apr 2, 2026
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
1 change: 0 additions & 1 deletion internal/controller/function_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand Down
1 change: 0 additions & 1 deletion internal/controller/function_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions internal/funccli/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ type DeployOptions struct {
RegistryAuthFile string

GitUrl string

Builder string
}

var _ Manager = &managerImpl{}
Expand Down Expand Up @@ -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 != "" {
Expand Down
Loading