diff --git a/.github/workflows/osl-images-pr-check.yml b/.github/workflows/osl-images-pr-check.yml new file mode 100644 index 000000000..1eed37683 --- /dev/null +++ b/.github/workflows/osl-images-pr-check.yml @@ -0,0 +1,22 @@ +name: OSL Images PR check + +on: pull_request +jobs: + validate_osl_imagestream: + concurrency: + group: ${{ github.repository.name }}_validate_osl_imagestream-${{ github.head_ref }} + cancel-in-progress: true + name: Validate OSL imagestreams + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Download openshift-validator-tool + run: | + wget https://github.com/jboss-container-images/jboss-kie-modules/raw/main/tools/openshift-template-validator/openshift-template-validator-linux-amd64 + - name: Add execution permission to openshift-validator-tool + run: | + chmod +x openshift-template-validator-linux-amd64 + mv openshift-template-validator-linux-amd64 ${HOME} + - name: validate OSL imagestream + run: | + ${HOME}/openshift-template-validator-linux-amd64 validate -f openshift-serverless-logic-imagestream.yaml diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits index 316cc17a5..f262ee7c4 100644 --- a/modules/kogito-dynamic-resources/added/container-limits +++ b/modules/kogito-dynamic-resources/added/container-limits @@ -121,17 +121,17 @@ min() { printf "%s\n" "$@" | sort -g | head -n1 } -local limit="$(core_limit)" +limit="$(core_limit)" if [ x$limit != x ]; then export CONTAINER_CORE_LIMIT="$limit" fi -local env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)" +env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)" if [ -n "$env_core_limit" ]; then export CORE_LIMIT="$env_core_limit" fi -local max_mem="$(container_memory)" +max_mem="$(container_memory)" if [ x$max_mem != x ]; then export CONTAINER_MAX_MEMORY="$max_mem" fi diff --git a/openshift-serverless-logic-imagestream.yaml b/openshift-serverless-logic-imagestream.yaml new file mode 100644 index 000000000..9377450c1 --- /dev/null +++ b/openshift-serverless-logic-imagestream.yaml @@ -0,0 +1,89 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +kind: ImageStreamList +apiVersion: v1 +metadata: + name: openshift-serverless-logic-image-streams + annotations: + description: ImageStream definitions for Red Hat OpenShift Serverless Logic images + openshift.io/provider-display-name: Kie Group +items: + - kind: ImageStream + apiVersion: v1 + metadata: + name: logic-data-index-ephemeral-rhel8 + annotations: + openshift.io/display-name: Red Hat build of Runtime image for SonataFlow Data Index Service for ephemeral PostgreSQL persistence provider + openshift.io/provider-display-name: Kie Group + spec: + tags: + - name: '1.32.0' + annotations: + description: Red Hat build of SonataFlow Data Index Service - ephemeral PostgreSQL + iconClass: icon-jbpm + tags: logic-data-index,sonataflow,data-index,data-index-ephemeral + supports: quarkus + version: '1.32.0' + referencePolicy: + type: Local + from: + kind: DockerImage + name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.32.0 + - kind: ImageStream + apiVersion: v1 + metadata: + name: logic-devmode + annotations: + openshift.io/display-name: Red Hat build of SonataFlow development mode image with Quarkus extensions libraries preinstalled. + openshift.io/provider-display-name: Kie Group + spec: + tags: + - name: '1.32.0' + annotations: + description: Red Hat build of SonataFlow development mode image with Quarkus extensions libraries preinstalled. + iconClass: icon-jbpm + tags: logic,devmode,sonataflow,development,serverless,workflow + supports: quarkus + version: '1.32.0' + referencePolicy: + type: Local + from: + kind: DockerImage + name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.32.0 + - kind: ImageStream + apiVersion: v1 + metadata: + name: logic-builder + annotations: + openshift.io/display-name: Red Hat build of Runtime image for SonataFlow builder with Quarkus extensions libraries preinstalled + openshift.io/provider-display-name: Kie Group + spec: + tags: + - name: '1.32.0' + annotations: + description: Red Hat build of Runtime image for SonataFlow builder with Quarkus extensions libraries preinstalled + iconClass: icon-jbpm + tags: logic,builder,sonataflow,workflow,serverless + supports: quarkus + version: '1.32.0' + referencePolicy: + type: Local + from: + kind: DockerImage + name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.32.0 diff --git a/productized/logic/build-quarkus-app.sh b/productized/logic/build-quarkus-app.sh index 7dd8fc085..972bfcd80 100755 --- a/productized/logic/build-quarkus-app.sh +++ b/productized/logic/build-quarkus-app.sh @@ -41,8 +41,8 @@ maven_plugins_gav=("org.apache.maven.plugins:maven-resources-plugin:3.3.1" "org. # Properties to be replaced in the pom by the new versions properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.version:3.1.2") -# arch specific dependencies -quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0" +# extra dependencies required for offline mode +quarkus_extensions_extra_deps="com.aayushatharva.brotli4j:native-linux-aarch64:1.12.0,org.apache.maven.plugins:maven-deploy-plugin:3.1.1,org.apache.maven.plugins:maven-site-plugin:3.12.1" # common extensions used by the kogito-swf-builder and kogito-swf-devmode quarkus_extensions="quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${kogito_version},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-serving:${kogito_version}" # dev mode purpose extensions used only by the kogito-swf-devmode @@ -57,10 +57,10 @@ fi case ${image_name} in "kogito-swf-builder") - quarkus_extensions="${quarkus_extensions},${kogito_swf_builder_extensions},${quarkus_extensions_arch_specific}" + quarkus_extensions="${quarkus_extensions},${kogito_swf_builder_extensions},${quarkus_extensions_extra_deps}" ;; "kogito-swf-devmode") - quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_arch_specific}" + quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_extra_deps}" ;; *) echo "${image_name} is not a quarkus app image, exiting..." diff --git a/productized/logic/pom.xml b/productized/logic/pom.xml index 0588d4c60..7b15fc8f1 100644 --- a/productized/logic/pom.xml +++ b/productized/logic/pom.xml @@ -28,8 +28,8 @@ kogito-swf-devmode kogito-swf-builder io.quarkus.platform - 2.16.7.Final - 1.40.0.Final + 3.2.9.Final + 999-SNAPSHOT