diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml index 07e8f7c4..f11c359e 100644 --- a/config/eventing-kafka-broker.yaml +++ b/config/eventing-kafka-broker.yaml @@ -41,6 +41,9 @@ config: - .*hermetic.* konflux: enabled: true + javaImages: + - .*eventing-kafka-broker-receiver + - .*eventing-kafka-broker-dispatcher openShiftVersions: - useClusterPool: true version: "4.16" diff --git a/pkg/konfluxgen/konfluxgen.go b/pkg/konfluxgen/konfluxgen.go index 89c2e263..3805b56b 100644 --- a/pkg/konfluxgen/konfluxgen.go +++ b/pkg/konfluxgen/konfluxgen.go @@ -244,7 +244,7 @@ func Generate(cfg Config) error { break } } - dockerfilePath := "" + dockerfilePath := ib.ProjectDirectoryImageBuildInputs.DockerfilePath for _, r := range javaImages { if r.MatchString(string(ib.To)) { pipeline = DockerJavaBuild @@ -267,6 +267,7 @@ func Generate(cfg Config) error { Tags: append(cfg.Tags, "latest"), BuildArgs: cfg.BuildArgs, PrefetchDeps: cfg.PrefetchDeps, + DockerfilePath: dockerfilePath, } if cfg.IsHermetic(c.ReleaseBuildConfiguration, ib) { @@ -380,7 +381,7 @@ func Generate(cfg Config) error { buf.Reset() - if config.Pipeline == FBCBuild { + if config.Pipeline == DockerJavaBuild { if err := pipelineDockerJavaBuildTemplate.Execute(buf, nil); err != nil { return fmt.Errorf("failed to execute template for pipeline %q: %w", containerJavaBuildPipelinePath, err) diff --git a/pkg/prowgen/prowgen_konflux.go b/pkg/prowgen/prowgen_konflux.go index 13ee7d3d..eb133ed1 100644 --- a/pkg/prowgen/prowgen_konflux.go +++ b/pkg/prowgen/prowgen_konflux.go @@ -146,6 +146,7 @@ func GenerateKonflux(ctx context.Context, openshiftRelease Repository, configs [ Excludes: b.Konflux.Excludes, ExcludesImages: b.Konflux.ExcludesImages, FBCImages: b.Konflux.FBCImages, + JavaImages: b.Konflux.JavaImages, ResourcesOutputPath: fmt.Sprintf("%s/.konflux", r.RepositoryDirectory()), PipelinesOutputPath: fmt.Sprintf("%s/.tekton", r.RepositoryDirectory()), Nudges: nudges,