[KOGITO-9244] Platform.spec.platform.baseImage does not update the Dockerfile base image (#181)

[KOGITO-9244]  Platform.spec.platform.baseImage does not update the Dockerfile base image

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

Author: davidesalerno

bundle/manifests/sonataflow-operator.clusterserviceversion.yaml

@@ -101,7 +101,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/kiegroup/kogito-serverless-operator
     support: Red Hat
-  name: sonataflow-operator.vlatest
+  name: sonataflow-operator.v2.0.0-snapshot
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -446,7 +446,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/kiegroup/kogito-serverless-operator-nightly:latest
+                image: quay.io/kiegroup/kogito-serverless-operator-nightly:2.0.0-snapshot
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -537,4 +537,4 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: Red Hat
-  version: latest
+  version: 2.0.0-snapshot

controllers/builder/containerbuilder.go

@@ -96,7 +96,7 @@ func newContainerBuilderManager(managerContext buildManagerContext, config *rest
 }
 
 func (c *containerBuilderManager) getImageBuilderForKaniko(workflowID string, imageNameTag string, workflowDefinition []byte, task *api.KanikoTask) imageBuilder {
-	containerFile := c.commonConfig.Data[c.commonConfig.Data[configKeyDefaultBuilderResourceName]]
+	containerFile := platform.GetCustomizedDockerfile(c.commonConfig.Data[c.commonConfig.Data[configKeyDefaultBuilderResourceName]], *c.platform)
 	ib := NewImageBuilder(workflowID, workflowDefinition, []byte(containerFile))
 	ib.OnNamespace(c.platform.Namespace)
 	ib.WithPodMiddleName(workflowID)

controllers/builder/openshiftbuilder.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
+	"github.com/kiegroup/kogito-serverless-operator/controllers/platform"
 	"github.com/kiegroup/kogito-serverless-operator/workflowproj"
 
 	kubeutil "github.com/kiegroup/kogito-serverless-operator/utils/kubernetes"
@@ -143,7 +144,7 @@ func (o *openshiftBuilderManager) Schedule(build *operatorapi.SonataFlowBuild) e
 
 func (o *openshiftBuilderManager) newDefaultBuildConfig(build *operatorapi.SonataFlowBuild) *buildv1.BuildConfig {
 	optimizationPol := buildv1.ImageOptimizationSkipLayers
-	dockerFile := o.commonConfig.Data[o.commonConfig.Data[configKeyDefaultBuilderResourceName]]
+	dockerFile := platform.GetCustomizedDockerfile(o.commonConfig.Data[o.commonConfig.Data[configKeyDefaultBuilderResourceName]], *o.platform)
 	return &buildv1.BuildConfig{
 		ObjectMeta: metav1.ObjectMeta{Namespace: build.Namespace, Name: build.Name},
 		Spec: buildv1.BuildConfigSpec{

controllers/platform/platformutils.go

@@ -16,7 +16,9 @@ package platform
 
 import (
 	"context"
+	"regexp"
 	"runtime"
+	"strings"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -34,6 +36,8 @@ import (
 	operatorapi "github.com/kiegroup/kogito-serverless-operator/api/v1alpha08"
 )
 
+var builderDockerfileFromRE = regexp.MustCompile(`FROM (.*) AS builder`)
+
 // ResourceCustomizer can be used to inject code that changes the objects before they are created.
 type ResourceCustomizer func(object ctrl.Object) ctrl.Object
 
@@ -142,3 +146,11 @@ func GetRegistryAddress(ctx context.Context, c client.Client) (*string, error) {
 	}
 	return nil, nil
 }
+
+func GetCustomizedDockerfile(dockerfile string, platform operatorapi.SonataFlowPlatform) string {
+	if platform.Spec.BuildPlatform.BaseImage != "" {
+		res := builderDockerfileFromRE.FindAllStringSubmatch(dockerfile, 1)
+		dockerfile = strings.Replace(dockerfile, strings.Trim(res[0][1], " "), platform.Spec.BuildPlatform.BaseImage, 1)
+	}
+	return dockerfile
+}

controllers/platform/platformutils_test.go

@@ -0,0 +1,46 @@
+// Copyright 2023 Red Hat, Inc. and/or its affiliates
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package platform
+
+import (
+	"os"
+	"regexp"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/kiegroup/kogito-serverless-operator/test"
+)
+
+func TestSonataFlowBuildController(t *testing.T) {
+	platform := test.GetBasePlatform()
+	dockerfileBytes, err := os.ReadFile("../../test/builder/Dockerfile")
+	if err != nil {
+		assert.Fail(t, "Unable to read base Dockerfile")
+	}
+	dockerfile := string(dockerfileBytes)
+	// 1 - Let's verify that the default image is used (for this unit test is quay.io/kiegroup/kogito-swf-builder-nightly:latest)
+	resDefault := GetCustomizedDockerfile(dockerfile, *platform)
+	foundDefault, err := regexp.MatchString("FROM quay.io/kiegroup/kogito-swf-builder-nightly:latest AS builder", resDefault)
+	assert.NoError(t, err)
+	assert.True(t, foundDefault)
+
+	// 2 - Let's try to override using the productized image
+	platform.Spec.BuildPlatform.BaseImage = "registry.access.redhat.com/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
+	resProductized := GetCustomizedDockerfile(dockerfile, *platform)
+	foundProductized, err := regexp.MatchString("FROM registry.access.redhat.com/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8 AS builder", resProductized)
+	assert.NoError(t, err)
+	assert.True(t, foundProductized)
+}

test/yaml.go

@@ -39,6 +39,8 @@ const (
 	sonataFlowPlatformForOpenshift            = "sonataflow.org_v1alpha08_sonataflowplatform_openshift.yaml"
 	sonataFlowBuilderConfig                   = "sonataflow-operator-builder-config_v1_configmap.yaml"
 
+	BuilderDockerfile = "builder_dockerfile.yaml"
+
 	configSamplesOneLevelPath = "../config/samples/"
 	configSamplesTwoLevelPath = "../../config/samples/"
 	e2eSamples                = "test/testdata/"