Skip to content

SRVOCF-859: Set S2I builder in generated GitHub CI workflow #182

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

Open
pmeida wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SRVOCF-859: Set S2I builder in generated GitHub CI workflow #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions backend/functions/ci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"io"

"knative.dev/func/pkg/builders"
cigithub "knative.dev/func/pkg/ci/github"
fn "knative.dev/func/pkg/functions"

Expand All @@ -21,6 +22,7 @@ func generateGithubCIFiles(dir string, cfg ScaffoldConfig) error {
Branch: cfg.Branch,
RegistryLogin: !cfg.InternalRegistry,
TestStep: cigithub.DefaultTestStep,
Builder: builders.S2I,
}),
cigithub.WithMessageWriter(io.Discard),
)
Expand Down
3 changes: 3 additions & 0 deletions backend/functions/scaffold_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package functions
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"knative.dev/func/pkg/builders"

"github.com/openshift/faas-console-plugin/backend/scm"
)
Expand Down Expand Up @@ -35,6 +36,8 @@ var _ = Describe("Generate", func() {
Expect(funcYAML).To(ContainSubstring("image-registry.openshift-image-registry.svc:5000/default"))

Expect(fileMap).To(HaveKey(".github/workflows/func-deploy.yaml"))
workflowYAML := fileMap[".github/workflows/func-deploy.yaml"]
Expect(workflowYAML).To(ContainSubstring("FUNC_BUILDER: " + builders.S2I))
})

It("returns an error when function init fails", func() {
Expand Down
41 changes: 20 additions & 21 deletions backend/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/onsi/gomega v1.42.1
golang.org/x/crypto v0.55.0
golang.org/x/sync v0.22.0
k8s.io/api v0.35.7
k8s.io/apimachinery v0.35.7
k8s.io/client-go v0.35.7
knative.dev/func v0.50.1-0.20260814161815-904d21e6044d
k8s.io/api v0.35.8
k8s.io/apimachinery v0.35.8
k8s.io/client-go v0.35.8
knative.dev/func v0.50.1-0.20260903074942-68fc15129663
sigs.k8s.io/yaml v1.6.0
)

Expand Down Expand Up @@ -43,7 +43,7 @@ require (
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.12.1-0.20260605190426-37f5cc9e58a7 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/cert-manager/cert-manager v1.16.3 // indirect
github.com/cert-manager/cert-manager v1.20.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chainguard-dev/git-urls v1.0.2 // indirect
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
Expand All @@ -60,14 +60,13 @@ require (
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.9.1 // indirect
github.com/go-git/go-git/v5 v5.19.2 // indirect
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v1.0.0 // indirect
Expand Down Expand Up @@ -147,10 +146,10 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/metric v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 // indirect
go.opentelemetry.io/otel v1.45.0 // indirect
go.opentelemetry.io/otel/metric v1.45.0 // indirect
go.opentelemetry.io/otel/trace v1.45.0 // indirect
go.podman.io/image/v5 v5.39.2-0.20260306124909-d48bc74146d6 // indirect
go.podman.io/storage v1.62.1-0.20260310180906-9819c3739308 // indirect
go.uber.org/atomic v1.11.0 // indirect
Expand All @@ -167,28 +166,28 @@ require (
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.49.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d // indirect
google.golang.org/protobuf v1.36.12 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.2 // indirect
k8s.io/apiextensions-apiserver v0.35.7 // indirect
k8s.io/apiserver v0.35.7 // indirect
k8s.io/apiextensions-apiserver v0.35.8 // indirect
k8s.io/apiserver v0.35.8 // indirect
k8s.io/cli-runtime v0.34.1 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 // indirect
knative.dev/client/pkg v0.0.0-20260729124858-e411e8847500 // indirect
knative.dev/eventing v0.50.0 // indirect
knative.dev/networking v0.0.0-20260727162500-c7a7b772cac9 // indirect
knative.dev/pkg v0.0.0-20260727151759-521cb33b33dd // indirect
knative.dev/serving v0.50.1-0.20260730142401-55399fec0dc5 // indirect
knative.dev/client/pkg v0.0.0-20260824022027-f22c1f6498a3 // indirect
knative.dev/eventing v0.50.1-0.20260826203415-973bbbc1f791 // indirect
knative.dev/networking v0.0.0-20260821014922-17b28c62e1cb // indirect
knative.dev/pkg v0.0.0-20260825072334-d2a153acc00c // indirect
knative.dev/serving v0.50.1-0.20260825144834-618b0c275af1 // indirect
sigs.k8s.io/controller-runtime v0.23.3 // indirect
sigs.k8s.io/gateway-api v1.4.1 // indirect
sigs.k8s.io/gateway-api v1.5.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.21.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
Expand Down
Loading