fix (jkube-kit/config) : docker.buildArg.* properties not taken into account in OpenShift plugins
#2996
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 #2996 (2024-04-30T18:20:53Z) ⚙️ JKube E2E Tests (8899552796)
|
sunix
reviewed
Apr 30, 2024
| @@ -133,7 +134,7 @@ protected static BuildStrategy createBuildStrategy( | |||
| .withNamespace(StringUtils.isEmpty(fromNamespace) ? null : fromNamespace) | |||
| .endFrom() | |||
| .withEnv(checkForEnv(imageConfig)) | |||
| .withBuildArgs(Optional.ofNullable(buildConfig.getArgs()).orElse(Collections.emptyMap()).entrySet().stream() | |||
| .withBuildArgs(Optional.of(mergeBuildArgs(imageConfig, jKubeServiceHub.getConfiguration())).orElse(Collections.emptyMap()).entrySet().stream() | |||
There was a problem hiding this comment.
as far as I remember, mergeBuildArgs is also taking build args from the local docker config which is not applicable for openshift remote docker build.
There was a problem hiding this comment.
You're right. How shall we handle this situation? Maybe add a boolean parameter in mergeBuildArgs to check whether to read local docker config or not?
There was a problem hiding this comment.
I've added a separate method BuildArgResolverUtil.mergeBuildArgsWithoutLocalDockerConfigProxySettings for providing build args from ImageConfig, system properties, project properties, and plugin configuration.
Not sure whether it's the best way to do it, I tried moving common sources to a separate method but it seemed a big ugly to me.
rohanKanojia
force-pushed
the
pr/issue2904
branch
from
c284d14 to
02a912d
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2996 +/- ##
=============================================
+ Coverage 59.36% 70.85% +11.49%
- Complexity 4586 5086 +500
=============================================
Files 500 490 -10
Lines 21211 19590 -1621
Branches 2830 2526 -304
=============================================
+ Hits 12591 13881 +1290
+ Misses 7370 4481 -2889
+ Partials 1250 1228 -22 ☔ View full report in Codecov by Sentry. |
rohanKanojia
force-pushed
the
pr/issue2904
branch
from
02a912d to
00bf004
Compare
…o account in OpenShift plugins Added call to resolve build args from all sources in OpenShiftBuildServiceUtils so that build args get resolved from all the available sources (compared to just ImageConfig) Signed-off-by: Rohan Kumar <[email protected]>
rohanKanojia
force-pushed
the
pr/issue2904
branch
from
00bf004 to
acbd181
Compare
|
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
Added call to resolve build args from all sources in OpenShiftBuildServiceUtils so that build args get resolved from all the available sources (compared to just ImageConfig)
Fixes #2904
Type of change
test, version modification, documentation, etc.)
Checklist