Containerbuild / konflux #1977
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - deployment.yaml | ||
| - sa.yaml | ||
| - rbac.yaml | ||
| - service.yaml | ||
| - route.yaml | ||
| labels: | ||
| - includeSelectors: true | ||
| pairs: | ||
| app: hacbs-jvm-console |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - deployment.yaml | ||
| - namespace.yaml | ||
| - sa.yaml | ||
| - rbac.yaml | ||
| - metricservice.yaml | ||
| labels: | ||
| - includeSelectors: true | ||
| pairs: | ||
| app: hacbs-jvm-operator |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -214,8 +214,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { | |
| } | ||
| for (var i : contaminatedGavs.entrySet()) { | ||
| if (!i.getValue().getAllowed()) { | ||
| i.getValue().getContaminatedArtifacts().forEach(gavs::remove); | ||
| } | ||
| } | ||
| generateBuildSbom(); | ||
|
|
@@ -241,6 +240,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { | |
| } | ||
| } | ||
|
|
||
| // TODO: ### For container-builds, should sbom generation be delegated to the task within that? If it supports it? | ||
| private void generateBuildSbom() { | ||
|
Collaborator
Author
There was a problem hiding this comment. @vibe13 To discuss ; Previously JBS handled SBOM after the build - I suspect now Konflux should handle that?
Member
There was a problem hiding this comment. 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!
Member
There was a problem hiding this comment. 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.
Collaborator
Author
There was a problem hiding this comment. 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. |
||
| if (buildInfoPath == null) { | ||
| Log.infof("Not generating build sbom, path not set"); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.