docker.buildArg.* properties not taken into account in OpenShift plugins

[sunix]

Describe the bug

The JKube Openshift Maven plugin fails to recognize specified Docker build-arg when they are injected into a Dockerfile from Maven properties. This issue manifests specifically when using Maven properties and does not occur with the XML/Gradle DSL configuration since #2895.
This issue occurs despite the JKube documentation confirming that build arguments can be specified either via the plugin configuration or as Maven properties.

Eclipse JKube version

SNAPSHOT

Component

OpenShift Maven Plugin

Apache Maven version

None

Gradle version

None

Steps to reproduce

1. Set Up the Dockerfile:
   Place the following content in src/main/docker/Dockerfile:

   ARG FILE_EXTENSION
   FROM docker.io/alpine:latest as builder
   RUN touch test.${FILE_EXTENSION}
   
   FROM docker.io/alpine:latest
   COPY --from=builder /test.txt /test.txt
   
   ENTRYPOINT ["ls"]

2. Configure the JKube Plugin:
   Insert the JKube Openshift Maven plugin configuration into your pom.xml:

   <plugin>
       <groupId>org.eclipse.jkube</groupId>
       <artifactId>openshift-maven-plugin</artifactId>
       <version>1.17-SNAPSHOT</version>
       <configuration>
         <buildStrategy>docker</buildStrategy>
         <images>
           <image>
             <name>helloworld:%l</name>
             <build>
               <contextDir>${project.basedir}/src/main/docker/</contextDir>
               <dockerFile>Dockerfile</dockerFile>
             </build>
           </image>
         </images>
       </configuration>
   </plugin>

3. Define the Build Argument:
   Define the build argument for the Docker image in your pom.xml:

   <properties>
       <docker.buildArg.FILE_EXTENSION>txt</docker.buildArg.FILE_EXTENSION>
   </properties>

4. Execute the Build Command:
   Execute the build using the following Maven command:

   mvn oc:build
   

5. Error Observation:
   The build process fails, yielding the following output:

   [INFO] oc: --> abd4c9e7124f
   [INFO] oc: [1/2] STEP 3/3: RUN touch test.${FILE_EXTENSION}
   [INFO] oc: --> ee9fcbe057df
   [INFO] oc: [2/2] STEP 1/5: FROM docker.io/alpine
   [INFO] oc: [2/2] STEP 2/5: COPY --from=builder test.txt test.txt
   [ERROR] oc: Failed to execute the build [Unable to build the image using the OpenShift build service]
   [ERROR] oc: Failed to tail build log: %s: java.lang.IllegalStateException: java.io.IOException: channel already closed with exception
   

Expected behavior

The docker.buildArg.FILE_EXTENSION property should be properly processed, enabling the substitution of ${FILE_EXTENSION} in the Dockerfile and ensuring the successful build of the Docker image with the specified configurations.

Runtime

OpenShift

Kubernetes API Server version

1.25.3

Environment

Linux

Eclipse JKube Logs

No response

Sample Reproducer Project

No response

Additional context

No response

[rohanKanojia]

I think this issue is happening because we're only modifying Image Build Config in case of docker build strategy.

Code for extracting build args from properties is here in BuildService:

jkube/jkube-kit/build/service/docker/src/main/java/org/eclipse/jkube/kit/build/service/docker/BuildService.java

Line 197 in ae8c283

private Map<String, String> addBuildArgsFromProperties(Properties properties) {

This gets called by DockerBuildService that is one of the implementations of AbstractImageBuildService . Other implementations are OpenShiftBuildService, JibBuildService, BuildPackBuildService.

This issue can be fixed by moving the logic upwards before build is delegated to Build Strategy specific Build Service implementations. Maybe it can be moved in DefaultGeneratorManager.generateAndMerge where we initialize and filter image configurations?:

jkube/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java

Lines 58 to 64 in 41b05b4

	// Init and validate Image configurations. These images will contain the valid configurations.
	final ImageNameFormatter imageNameFormatter = new ImageNameFormatter(genCtx.getProject(), genCtx.getBuildTimestamp());
	for (ImageConfiguration imageConfiguration : filteredImages) {
	imageConfiguration.setName(imageNameFormatter.format(imageConfiguration.getName()));
	if (imageConfiguration.getBuild() != null) {
	BuildConfiguration updatedBuildConfig = mergeGlobalConfigParamsWithSingleImageBuildConfig(imageConfiguration.getBuild());
	imageConfiguration.setBuild(updatedBuildConfig);