Containerbuild / konflux #1977

rnc · 2024-07-23T13:47:24Z

No description provided.

openshift-ci · 2024-07-23T13:47:28Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

...uild-request-processor/src/main/java/com/redhat/hacbs/container/deploy/TagDeployCommand.java

rnc · 2024-07-23T13:55:49Z

...ld-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java

    }

+    // TODO: ### For container-builds, should sbom generation be delegated to the task within that? If it supports it?
    private void generateBuildSbom() {


@vibe13 To discuss ; Previously JBS handled SBOM after the build - I suspect now Konflux should handle that?

Mmmm no sure about Konflux handling java SBOMs. Rather, SBOMer could be used because it can generate good quality manifests. But, JBS has the capability to manifest the contaminated GAVs and contaminants, so we can think of JBS creating a skeleton SBOM to be later enriched by SBOMer. I would keep it in for now, then we will discuss with Marek and see how to design this. Good point!

But, I would like to see the content of SBOMs generated by Konflux regardless. There were discussions about merging our generated SBOMs with Konflux generated ones.

At the moment we don't have any way of handling / storing the sbom - this was handled by BuildVerifyCommand but as we don't have a way as far as I know in the buildah based task to access the .m2/gradle repositories (as we don't have a shared workspace) I think this now needs to be handled specifically by Konflux.

pkg/reconciler/dependencybuild/buildrecipeyaml.go

rnc · 2024-07-23T13:57:33Z

pkg/reconciler/dependencybuild/buildrecipeyaml.go

+				//	//{Name: WorkspaceBuildSettings, Workspace: WorkspaceBuildSettings},
+				//	{Name: WorkspaceSource, Workspace: WorkspaceSource},
+				//	//{Name: WorkspaceTls, Workspace: WorkspaceTls},
+				//},


Currently I haven't figured out how (if at all) we can pass the setting.xml/tls shared workspaces - I suspect we'll need a different approach.

pkg/reconciler/dependencybuild/buildrecipeyaml.go

codecov · 2024-07-23T14:00:59Z

Codecov Report

Attention: Patch coverage is 75.00000% with 66 lines in your changes missing coverage. Please review.

Project coverage is 39.51%. Comparing base (18b09dd) to head (739d5ee).
Report is 20 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/reconciler/dependencybuild/buildrecipeyaml.go	75.59%	58 Missing and 4 partials ⚠️
...edhat/hacbs/container/deploy/TagDeployCommand.java	0.00%	2 Missing ⚠️
...hat/hacbs/container/deploy/BuildVerifyCommand.java	0.00%	1 Missing ⚠️
pkg/reconciler/dependencybuild/dependencybuild.go	80.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #1977      +/-   ##
============================================
+ Coverage     39.38%   39.51%   +0.13%     
+ Complexity      812      811       -1     
============================================
  Files           301      301              
  Lines         14040    14145     +105     
  Branches       1469     1467       -2     
============================================
+ Hits           5529     5589      +60     
- Misses         7861     7907      +46     
+ Partials        650      649       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

vibe13

I have put some more questions for the sake of my understanding but overall it makes sense to me, thanks Nick!

...ld-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java

vibe13 · 2024-07-25T09:36:27Z

...ld-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java

    }

+    // TODO: ### For container-builds, should sbom generation be delegated to the task within that? If it supports it?
    private void generateBuildSbom() {


Mmmm no sure about Konflux handling java SBOMs. Rather, SBOMer could be used because it can generate good quality manifests. But, JBS has the capability to manifest the contaminated GAVs and contaminants, so we can think of JBS creating a skeleton SBOM to be later enriched by SBOMer. I would keep it in for now, then we will discuss with Marek and see how to design this. Good point!

...uild-request-processor/src/main/java/com/redhat/hacbs/container/deploy/TagDeployCommand.java

java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml

vibe13 · 2024-07-25T09:54:46Z

...ld-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java

    }

+    // TODO: ### For container-builds, should sbom generation be delegated to the task within that? If it supports it?
    private void generateBuildSbom() {


But, I would like to see the content of SBOMs generated by Konflux regardless. There were discussions about merging our generated SBOMs with Konflux generated ones.

pkg/reconciler/dependencybuild/dependencybuild.go

pkg/reconciler/dependencybuild/buildrecipeyaml.go

vibe13 · 2024-07-25T12:49:20Z

pkg/reconciler/dependencybuild/buildrecipeyaml.go

+				//	//{Name: WorkspaceBuildSettings, Workspace: WorkspaceBuildSettings},
+				//	{Name: WorkspaceSource, Workspace: WorkspaceSource},
+				//	//{Name: WorkspaceTls, Workspace: WorkspaceTls},
+				//},


pkg/reconciler/dependencybuild/buildrecipeyaml.go

openshift-ci · 2024-07-25T13:37:22Z

New changes are detected. LGTM label has been removed.

pkg/reconciler/dependencybuild/buildrecipeyaml.go

deploy/minikube-ci.sh

rnc · 2024-08-01T15:04:08Z

/retest

openshift-ci bot added the do-not-merge/work-in-progress label Jul 23, 2024

rnc requested a review from vibe13 July 23, 2024 13:48

rnc commented Jul 23, 2024

View reviewed changes

...uild-request-processor/src/main/java/com/redhat/hacbs/container/deploy/TagDeployCommand.java Outdated Show resolved Hide resolved

rnc commented Jul 23, 2024

View reviewed changes

pkg/reconciler/dependencybuild/buildrecipeyaml.go Outdated Show resolved Hide resolved

rnc commented Jul 23, 2024

View reviewed changes

pkg/reconciler/dependencybuild/buildrecipeyaml.go Show resolved Hide resolved

rnc commented Jul 23, 2024

View reviewed changes

pkg/reconciler/dependencybuild/buildrecipeyaml.go Outdated Show resolved Hide resolved

vibe13 approved these changes Jul 25, 2024

View reviewed changes

openshift-ci bot assigned vibe13 Jul 25, 2024

openshift-ci bot added the lgtm label Jul 25, 2024

rnc force-pushed the PIPELINE branch from 6effd2a to 95c7d37 Compare July 25, 2024 13:37

openshift-ci bot removed the lgtm label Jul 25, 2024

rnc force-pushed the PIPELINE branch 4 times, most recently from 2ff591a to 9d5d9c4 Compare July 26, 2024 12:13

rnc commented Jul 26, 2024

View reviewed changes

pkg/reconciler/dependencybuild/buildrecipeyaml.go Show resolved Hide resolved

rnc force-pushed the PIPELINE branch from 9d5d9c4 to 1f15a9e Compare July 26, 2024 12:44

dwalluck reviewed Jul 26, 2024

View reviewed changes

deploy/minikube-ci.sh Show resolved Hide resolved

rnc force-pushed the PIPELINE branch 2 times, most recently from dc28e32 to b94f702 Compare July 31, 2024 08:31

rnc marked this pull request as ready for review August 1, 2024 08:55

openshift-ci bot removed the do-not-merge/work-in-progress label Aug 1, 2024

rnc force-pushed the PIPELINE branch 3 times, most recently from a536235 to b3ccee1 Compare August 1, 2024 09:47

rnc force-pushed the PIPELINE branch from 95e0f1b to 040baa5 Compare August 1, 2024 12:59

rnc force-pushed the PIPELINE branch 2 times, most recently from 1eda89f to 5ac7bec Compare August 16, 2024 11:40

rnc added 10 commits August 16, 2024 15:24

Containerbuild / konflux

38972ac

Updates for OCI building

882d632

Restructure task layout

42e5a72

More restructuring and result parameter modifications.

ddec172

Fix non-container build. Remove unused code

c4d7c7d

Fix minikube

b11e727

Fix deprecated commonLabels

e209474

Remove unused code. Restore support for Ant builds

7c1e668

Refactor containerfile layouts

4d37201

Remove e2e test as we don't store sources/logs

739d5ee

rnc force-pushed the PIPELINE branch from 5ac7bec to 739d5ee Compare August 16, 2024 14:24

rnc merged commit 7beffb7 into redhat-appstudio:main Aug 30, 2024

rnc deleted the PIPELINE branch August 30, 2024 11:35

Containerbuild / konflux #1977

Containerbuild / konflux #1977

Uh oh!

Conversation

rnc commented Jul 23, 2024

Uh oh!

openshift-ci bot commented Jul 23, 2024

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rnc Jul 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jul 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

vibe13 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Jul 25, 2024

Uh oh!

Uh oh!

Uh oh!

rnc commented Aug 1, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rnc Jul 25, 2024 •

edited

Loading

codecov bot commented Jul 23, 2024 •

edited

Loading