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

kie-issues#1285: Remove unnecessary base image from quarkus examples (quay.io/kiegroup/kogito-runtime-jvm:latest) #2457

Merged
merged 4 commits into from
Jul 8, 2024
Merged

kie-issues#1285: Remove unnecessary base image from quarkus examples (quay.io/kiegroup/kogito-runtime-jvm:latest) #2457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec1fcac
Changed image pointer
fantonangeli Jul 1, 2024
067f9f0
Update packages/sonataflow-operator/version/version.go
fantonangeli Jul 3, 2024
f4f0caa
Update packages/sonataflow-operator/version/version.go
fantonangeli Jul 3, 2024
1ba05fa
Renaming openJDKImageVersion
fantonangeli Jul 3, 2024
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
2 changes: 1 addition & 1 deletion examples/sonataflow-greeting-quarkus-example/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 6 additions & 2 deletions packages/sonataflow-operator/bddframework/pkg/framework/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
Expand Down Expand Up @@ -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())
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions packages/sonataflow-operator/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading