Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(oc-build): Correctly pass Docker build-arg from the build configuration to the Openshift build strategy #2895

Merged
merged 1 commit into from
Apr 11, 2024
Merged

fix(oc-build): Correctly pass Docker build-arg from the build configuration to the Openshift build strategy #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Usage:
### 1.17-SNAPSHOT
* Fix #2335: Add support for configuring nodeSelector spec for controller via xml/groovy DSL configuration
* Fix #2459: Allow configuring Buildpacks build via ImageConfiguration
* Fix #2860: Correctly pass Docker build-arg from the build configuration to the Openshift build strategy

### 1.16.2 (2024-03-27)
* Fix #2461: `k8s:watch`/`k8sWatch` should throw error in `buildpacks` build strategy
Expand Down
6 changes: 6 additions & 0 deletions .../main/java/org/eclipse/jkube/kit/config/service/openshift/OpenShiftBuildServiceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.eclipse.jkube.kit.config.service.openshift;

import io.fabric8.kubernetes.api.model.EnvVar;
import io.fabric8.kubernetes.api.model.EnvVarBuilder;
import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder;
import io.fabric8.openshift.api.model.BuildConfig;
import io.fabric8.openshift.api.model.BuildConfigSpec;
Expand Down Expand Up @@ -132,6 +133,11 @@ protected static BuildStrategy createBuildStrategy(
.withNamespace(StringUtils.isEmpty(fromNamespace) ? null : fromNamespace)
.endFrom()
.withEnv(checkForEnv(imageConfig))
.withBuildArgs(imageConfig.getBuildConfiguration().getArgs().entrySet().stream()
.map(bcArg -> new EnvVarBuilder()
.withName(bcArg.getKey())
.withValue(bcArg.getValue()).build())
.collect(Collectors.toList()))
.withNoCache(checkForNocache(imageConfig))
.endDockerStrategy().build();
if (openshiftPullSecret != null) {
Expand Down
29 changes: 29 additions & 0 deletions ...t/java/org/eclipse/jkube/kit/config/service/openshift/OpenShiftBuildServiceUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.eclipse.jkube.kit.config.service.JKubeServiceException;
import org.eclipse.jkube.kit.config.service.JKubeServiceHub;

import io.fabric8.kubernetes.api.model.EnvVarBuilder;
import io.fabric8.openshift.api.model.BuildConfig;
import io.fabric8.openshift.api.model.BuildConfigBuilder;
import io.fabric8.openshift.api.model.BuildConfigSpec;
Expand Down Expand Up @@ -196,6 +197,34 @@ void createBuildStrategy_withDockerBuildStrategyAndNoPullSecret_shouldReturnVali
.hasFieldOrPropertyWithValue("from.name", "ubi8/s2i-base");
}

@Test
void createBuildStrategy_withDockerBuildArgs_shouldReturnValidBuildStrategyWithBuildArgs() {
// Given
when(jKubeServiceHub.getBuildServiceConfig().getJKubeBuildStrategy())
.thenReturn(JKubeBuildStrategy.docker);
ImageConfiguration imageConfig = ImageConfiguration.builder()
.name("myapp")
.build(BuildConfiguration.builder()
.from("ubi8/s2i-base")
.args(Collections.singletonMap("BUILD_ARGS_KEY", "build-args-value"))
.build())
.build();
// When
final BuildStrategy result = createBuildStrategy(jKubeServiceHub, imageConfig, "my-secret-for-pull");
// Then
assertThat(result)
.hasFieldOrPropertyWithValue("type", "Docker")
.extracting(BuildStrategy::getDockerStrategy)
.hasFieldOrPropertyWithValue("from.kind", "DockerImage")
.hasFieldOrPropertyWithValue("from.name", "ubi8/s2i-base")
.extracting("buildArgs").asList().hasSize(1).first().satisfies(
envVar -> {
assertThat(envVar)
.hasFieldOrPropertyWithValue("name", "BUILD_ARGS_KEY")
.hasFieldOrPropertyWithValue("value", "build-args-value");
});
}

@Test
void createBuildStrategy_withDockerBuildStrategyAndPullSecret_shouldReturnValidBuildStrategy() {
// Given
Expand Down