[KOGITO-9748] 🐛 Fix passing arguments to internal Kaniko builder (#245)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

Author: ricardozanini

bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml

@@ -2,9 +2,10 @@ apiVersion: v1
 data:
   DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
   DEFAULT_WORKFLOW_EXTENSION: .sw.json
-  Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder\n
-    \ \n  # Copy from build context to skeleton resources project\nCOPY --chmod=644
-    * ./resources/\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n  #=============================\n
+  Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder\n\n
+    # variables that can be overridden by the builder\nARG QUARKUS_EXTENSIONS\n\n
+    \ # Copy from build context to skeleton resources project\nCOPY --chmod=644 *
+    ./resources/\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n  #=============================\n
     \ # Runtime Run\n  #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
     LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n  \n  # We make four distinct layers so
     if there are application changes the library layers can be re-used\nCOPY --from=builder

config/manager/sonataflow_builder_dockerfile.yaml

@@ -1,5 +1,8 @@
 FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder
-  
+
+ # variables that can be overridden by the builder
+ARG QUARKUS_EXTENSIONS
+
   # Copy from build context to skeleton resources project
 COPY --chmod=644 * ./resources/
 

container-builder/builder/kubernetes/builder_kaniko.go

@@ -19,14 +19,16 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
+	"github.com/kiegroup/kogito-serverless-operator/container-builder/client"
+
 	"github.com/kiegroup/kogito-serverless-operator/container-builder/api"
 )
 
 var _ Scheduler = &kanikoScheduler{}
 
 type kanikoScheduler struct {
-	*scheduler
-	KanikoTask *api.KanikoTask
+	baseScheduler *scheduler
+	KanikoTask    *api.KanikoTask
 }
 
 type kanikoSchedulerHandler struct {
@@ -90,13 +92,28 @@ func (sk *kanikoScheduler) WithAdditionalArgs(flags []string) Scheduler {
 	return sk
 }
 
+func (sk *kanikoScheduler) WithResource(target string, content []byte) Scheduler {
+	sk.baseScheduler.WithResource(target, content)
+	return sk
+}
+
+func (sk *kanikoScheduler) WithConfigMapResource(configMap corev1.LocalObjectReference, path string) Scheduler {
+	sk.baseScheduler.WithConfigMapResource(configMap, path)
+	return sk
+}
+
+func (sk *kanikoScheduler) WithClient(client client.Client) Scheduler {
+	sk.baseScheduler.WithClient(client)
+	return sk
+}
+
 func (sk *kanikoScheduler) Schedule() (*api.ContainerBuild, error) {
 	// verify if we really need this
-	for _, task := range sk.builder.Context.ContainerBuild.Spec.Tasks {
+	for _, task := range sk.baseScheduler.builder.Context.ContainerBuild.Spec.Tasks {
 		if task.Kaniko != nil {
 			task.Kaniko = sk.KanikoTask
 			break
 		}
 	}
-	return sk.scheduler.Schedule()
+	return sk.baseScheduler.Schedule()
 }

controllers/builder/containerbuilder.go

@@ -60,7 +60,14 @@ func (c *containerBuilderManager) Schedule(build *operatorapi.SonataFlowBuild) e
 		Resources:              build.Spec.Resources,
 		AdditionalFlags:        build.Spec.Arguments,
 	}
-	containerBuilder, err := c.scheduleNewKanikoBuildWithContainerFile(build, kanikoTask)
+	var containerBuilder *api.ContainerBuild
+	var err error
+	if containerBuilder, err = c.scheduleNewKanikoBuildWithContainerFile(build, kanikoTask); err != nil {
+		return err
+	}
+	if containerBuilder == nil {
+		return nil
+	}
 	if err = build.Status.SetInnerBuild(containerBuilder); err != nil {
 		return err
 	}
@@ -166,6 +173,8 @@ func newBuild(kb internalBuilder, platform api.PlatformContainerBuild, defaultEx
 	scheduler := builder.NewBuild(buildInfo).
 		WithResource(resourceDockerfile, kb.ContainerFile).
 		WithResource(kb.Workflow.Name+defaultExtension, kb.WorkflowDefinition).
+		WithAdditionalArgs(kb.AdditionalFlags).
+		WithResourceRequirements(kb.ResourceReqs).
 		WithClient(cli)
 
 	for _, res := range kb.Workflow.Spec.Resources.ConfigMaps {

controllers/sonataflowbuild_controller_test.go

@@ -62,3 +62,40 @@ func TestSonataFlowBuildController(t *testing.T) {
 	assert.NoError(t, ksb.Status.GetInnerBuild(containerBuild))
 	assert.Equal(t, string(ksb.Status.BuildPhase), string(containerBuild.Status.Phase))
 }
+
+func TestSonataFlowBuildController_WithArgs(t *testing.T) {
+	namespace := t.Name()
+	ksw := test.GetBaseSonataFlow(namespace)
+	ksb := test.GetNewEmptySonataFlowBuild(ksw.Name, namespace)
+
+	ksb.Spec.Arguments = make([]string, 1)
+	ksb.Spec.Arguments[0] = "--build-args=MYENV=VALUE"
+
+	cl := test.NewKogitoClientBuilder().
+		WithRuntimeObjects(ksb, ksw).
+		WithRuntimeObjects(test.GetBasePlatformInReadyPhase(namespace)).
+		WithRuntimeObjects(test.GetSonataFlowBuilderConfig("../", namespace)).
+		WithStatusSubresource(ksb, ksw).
+		Build()
+
+	r := &SonataFlowBuildReconciler{cl, cl.Scheme(), &record.FakeRecorder{}, &rest.Config{}}
+	req := reconcile.Request{
+		NamespacedName: types.NamespacedName{
+			Name:      ksb.Name,
+			Namespace: ksb.Namespace,
+		},
+	}
+
+	result, err := r.Reconcile(context.TODO(), req)
+	assert.NoError(t, err)
+	assert.Equal(t, requeueAfterForNewBuild, result.RequeueAfter)
+
+	assert.NoError(t, cl.Get(context.TODO(), req.NamespacedName, ksb))
+	assert.Equal(t, operatorapi.BuildPhaseScheduling, ksb.Status.BuildPhase)
+	assert.NotNil(t, ksb.Status.InnerBuild)
+
+	containerBuild := &api.ContainerBuild{}
+	assert.NoError(t, ksb.Status.GetInnerBuild(containerBuild))
+	assert.Equal(t, string(ksb.Status.BuildPhase), string(containerBuild.Status.Phase))
+	assert.Len(t, containerBuild.Spec.Tasks[0].Kaniko.AdditionalFlags, 1)
+}

operator.yaml

@@ -3018,9 +3018,10 @@ apiVersion: v1
 data:
   DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
   DEFAULT_WORKFLOW_EXTENSION: .sw.json
-  Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder\n
-    \ \n  # Copy from build context to skeleton resources project\nCOPY --chmod=644
-    * ./resources/\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n  #=============================\n
+  Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder\n\n
+    # variables that can be overridden by the builder\nARG QUARKUS_EXTENSIONS\n\n
+    \ # Copy from build context to skeleton resources project\nCOPY --chmod=644 *
+    ./resources/\n\nRUN /home/kogito/launch/build-app.sh ./resources\n  \n  #=============================\n
     \ # Runtime Run\n  #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
     LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n  \n  # We make four distinct layers so
     if there are application changes the library layers can be re-used\nCOPY --from=builder