feat (jkube-kit) : Add configuration option for overriding buildpack builder image (#2470) #2940
Conversation
This file contains 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
Eclipse JKube CI ReportStarted new GH workflow run for #2940 (2024-04-24T10:56:21Z) ⚙️ JKube E2E Tests (8815050588)
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2940 +/- ##
=============================================
+ Coverage 59.36% 70.62% +11.26%
- Complexity 4586 5034 +448
=============================================
Files 500 488 -12
Lines 21211 19514 -1697
Branches 2830 2513 -317
=============================================
+ Hits 12591 13781 +1190
+ Misses 7370 4504 -2866
+ Partials 1250 1229 -21 ☔ View full report in Codecov by Sentry. |
rohanKanojia
force-pushed
the
pr/issue2470
branch
from
71c2263
to
34279d7
Compare
rohanKanojia
force-pushed
the
pr/issue2470
branch
from
34279d7
to
0221d4c
Compare
manusa
reviewed
Apr 24, 2024
| @@ -216,7 +217,7 @@ void whenImageConfigurationContainsPackBuildArguments_thenArgumentsPassedToBuild | |||
| buildPackBuildService.buildSingleImage(imageConfiguration); | |||
|
|
|||
| // Then | |||
| verify(kitLogger).info("[[s]]%s", "build foo/bar:latest --builder paketobuildpacks/builder:base --creation-time now --pull-policy if-not-present --volume /tmp/volume:/platform/volume:ro --tag foo/bar:t1 --tag foo/bar:t2 --tag foo/bar:t3 --env BP_SPRING_CLOUD_BINDINGS_DISABLED=true"); | |||
| verify(kitLogger).info("[[s]]%s", "build foo/bar:latest --builder paketobuildpacks/builder:tiny --creation-time now --pull-policy if-not-present --volume /tmp/volume:/platform/volume:ro --tag foo/bar:t1 --tag foo/bar:t2 --tag foo/bar:t3 --env BP_SPRING_CLOUD_BINDINGS_DISABLED=true"); | |||
There was a problem hiding this comment.
Ref: this is because the arguments contained also the default values which now are configurable, hence the change in the builder image as opposed to the previous DEFAULT_BUILDER_IMAGE = "paketobuildpacks/builder:base"
manusa
reviewed
Apr 24, 2024
|
|
||
| | *buildpacksBuilderImage* | ||
| | Configure https://buildpacks.io/docs/for-platform-operators/concepts/builder/[BuildPack builder] OCI image for BuildPack Build. This field is applicable only in `buildpacks` build strategy. | ||
| Defaults to `null` |
There was a problem hiding this comment.
Are we sure this defaults to null?
There was a problem hiding this comment.
This is BaseGenerator's config option. I see we've put null as default value there. https://github.com/rohanKanojia/jkube/blob/pr/issue2470/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java#L81
There was a problem hiding this comment.
Yes, that's code-wise. However, from a user's perspective, the default value is not null, but whatever default image we're using.
There was a problem hiding this comment.
Shall I add paketobuildpacks/builder:base here instead?
There was a problem hiding this comment.
I think that would make more sense than null
rohanKanojia
force-pushed
the
pr/issue2470
branch
from
0221d4c
to
ce38b22
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2940 +/- ##
=============================================
+ Coverage 59.36% 70.74% +11.38%
- Complexity 4586 5057 +471
=============================================
Files 500 489 -11
Lines 21211 19548 -1663
Branches 2830 2518 -312
=============================================
+ Hits 12591 13830 +1239
+ Misses 7370 4490 -2880
+ Partials 1250 1228 -22 ☔ View full report in Codecov by Sentry. |
…builder image Add a field in ImageConfiguration's Build named `buildpacksBuilderImage` that can be used by the user for configuring buildpack builder image. This field would also be exposed via `jkube.generator.buildpacksBuilderImage` property and generators `buildpacksBuilderImage` config Signed-off-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia
force-pushed
the
pr/issue2470
branch
from
ce38b22
to
01de374
Compare
manusa
reviewed
Apr 24, 2024
| @@ -78,6 +78,7 @@ enum Config implements Configs.Config { | |||
|
|
|||
| // Base image mode (only relevant for OpenShift) | |||
| FROM_MODE("fromMode", null), | |||
| BUILDPACKS_BUILDER_IMAGE("buildpacksBuilderImage", null), | |||
There was a problem hiding this comment.
OK, now this starts to make more sense. Why isn't the default builder image resolved from the configuration?
There was a problem hiding this comment.
Umm, at the moment builder image configured from ImageConfiguration has more precedence over builder image from local ~/.pack/config. If we set the default builder image here we might not be able to distinguish in BuildPackBuildService whether it has been set explicitly by the user or it's opinionated default.
There was a problem hiding this comment.
OK, I recall there was a similar situation for other configuration flags.
I can't recall how those got fixed.
There was a problem hiding this comment.
Let's move on with this, and we can check at another moment
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fix #2470
Add a field in ImageConfiguration's Build named
buildpacksBuilderImagethat can be used by the user for configuring buildpack builder image. This field would also be exposed viajkube.generator.buildpacksBuilderImageproperty and generatorsbuildpacksBuilderImageconfigType of change
test, version modification, documentation, etc.)
Checklist