kie-issues#1285: Remove unnecessary base image from quarkus examples …

…(quay.io/kiegroup/kogito-runtime-jvm:latest) (apache#2457) Co-authored-by: Tiago Bento <[email protected]>
rodrigonull · Jul 8, 2024 · 33adc67 · 33adc67
1 parent e7f0382
commit 33adc67
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/examples/sonataflow-greeting-quarkus-example/src/main/resources/application.properties b/examples/sonataflow-greeting-quarkus-example/src/main/resources/application.properties
@@ -28,5 +28,5 @@ quarkus.native.native-image-xmx=8g
 %container.quarkus.container-image.registry=dev.local
 %container.quarkus.container-image.tag=1.0-SNAPSHOT
 %container.quarkus.jib.jvm-entrypoint=/home/kogito/kogito-app-launch.sh
-%container.quarkus.jib.base-jvm-image=quay.io/kiegroup/kogito-runtime-jvm:latest
+%container.quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi9/openjdk-17:1.20
 %container.quarkus.jib.working-directory=/home/kogito/bin
diff --git a/packages/sonataflow-operator/bddframework/pkg/framework/util.go b/packages/sonataflow-operator/bddframework/pkg/framework/util.go
@@ -51,7 +51,7 @@ const (
 	// defaultBuilderImage Builder Image for Kogito
 	defaultBuilderImage = "kogito-s2i-builder"
 	// defaultRuntimeJVM Runtime Image for Kogito with  JRE
-	defaultRuntimeJVM = "kogito-runtime-jvm"
+	defaultRuntimeJVM = "registry.access.redhat.com/ubi9/openjdk-17"
 	//defaultRuntimeNative Runtime Image for Kogito for Native Quarkus Application
 	defaultRuntimeNative = "kogito-runtime-native"
 	// imageRegistryEnvVar ...
@@ -292,7 +292,11 @@ func AppendImageDefaultValues(image *api.Image) {
 	}
 
 	if len(image.Tag) == 0 {
-		image.Tag = GetKogitoImageVersion(version.GetTagVersion())
+		if image.Name == defaultRuntimeJVM {
+			image.Tag = GetKogitoImageVersion(version.GetOpenJDKImageTagVersion())
+		} else {
+			image.Tag = GetKogitoImageVersion(version.GetTagVersion())
+		}
 	}
 }
 

diff --git a/packages/sonataflow-operator/version/version.go b/packages/sonataflow-operator/version/version.go
@@ -33,8 +33,15 @@ const (
 	tagVersion = "main"
 	// Kogito images tag version. Used for data-index and jobs-service images.
 	kogitoImagesTagVersion = "999-20240623"
+	// OpenJDK image tag version
+	openJDKImageTagVersion = "1.20"
 )
 
+// GetOpenJDKImageTagVersion gets the current OpenJDK image version.
+func GetOpenJDKImageTagVersion() string {
+	return openJDKImageTagVersion
+}
+
 // GetOperatorVersion gets the current binary version of the operator. Do not use it to compose image tags!
 func GetOperatorVersion() string {
 	return operatorVersion