This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
The following commit(s) were added to refs/heads/main by this push:
new feebea2e [NO-ISSUE] Remove MongoDB leftovers duo to ASF restrictions
(#1732)
feebea2e is described below
commit feebea2e272bf62ae5fab8e18c98314b1d1240c3
Author: Ricardo Zanini <[email protected]>
AuthorDate: Fri Jan 19 14:40:00 2024 -0300
[NO-ISSUE] Remove MongoDB leftovers duo to ASF restrictions (#1732)
* Remove MongoDB leftovers duo to ASF restrictions
Signed-off-by: Ricardo Zanini <[email protected]>
* Removing composer references on Infinispan and MongoDB
Signed-off-by: Ricardo Zanini <[email protected]>
* Remove Inifinispan leftovers
Signed-off-by: Ricardo Zanini <[email protected]>
---------
Signed-off-by: Ricardo Zanini <[email protected]>
---
README.md | 9 ++--
.../jobs-service/container-compose-infinispan.yaml | 46 ------------------
.../jobs-service/container-compose-mongodb.yaml | 54 ----------------------
contrib/jobs-service/infinispan/infinispan.xml | 19 --------
kogito-jobs-service-allinone-image.yaml | 6 +--
.../added/kogito-app-launch.sh | 2 +-
modules/kogito-jobs-service-all-in-one/configure | 10 ----
modules/kogito-jobs-service-all-in-one/module.yaml | 4 --
scripts/build-kogito-apps-components.sh | 2 -
.../kogito-jobs-service-all-in-one.feature | 36 +--------------
10 files changed, 9 insertions(+), 179 deletions(-)
diff --git a/README.md b/README.md
index 9be81e49..f511a8d4 100644
--- a/README.md
+++ b/README.md
@@ -615,7 +615,7 @@ Today we have the following Kogito Component Images:
The Data Index Service aims at capturing and indexing data produced by one
more Kogito runtime services.
For more information please visit this
(link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift).
-The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
+The Data Index Service depends on a PostgreSQL instance.
The Persistence service can be switched by using its corresponding image
- Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
@@ -639,7 +639,7 @@ $ docker run -it --env
QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:
To enable debug just use this env while running this image:
```bash
-$ docker run -it --env SCRIPT_DEBUG=true --env
QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222
quay.io/kiegroup/kogito-data-index-postgresql:latest
+$ docker run -it --env SCRIPT_DEBUG=true
quay.io/kiegroup/kogito-data-index-postgresql:latest
```
You should notice a few debug messages present in the system output.
@@ -675,16 +675,13 @@ docker run -it --env SCRIPT_DEBUG=true
quay.io/kiegroup/kogito-jobs-service-post
You should notice a few debug messages being printed in the system output.
The ephemeral image does not have external dependencies like a backend
persistence provider, it uses in-memory persistence
-while working with Jobs Services `allinone`, `infinispan`, `mongodb` and
`postgresql` variants, it will need to
-have an Infinispan, MongoDB or PostgreSQL server, respectively, previously
running.
+while working with Jobs Services `postgresql` variant, it will need to have a
PostgreSQL server previously running.
#### Jobs Services All-in-one
The Jobs Services All in One image provides the option to run any supported
variant that we have at disposal, which are:
- PostgreSQL
-- Infinispan
-- MongoDB
- Ephemeral (default if no variant is specified)
There are 3 exposed environment variables that can be used to configure the
behaviour, which are:
diff --git a/contrib/jobs-service/container-compose-infinispan.yaml
b/contrib/jobs-service/container-compose-infinispan.yaml
deleted file mode 100644
index 0ecfb2b3..00000000
--- a/contrib/jobs-service/container-compose-infinispan.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# 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.
-#
-services:
- infinispan:
- image: infinispan/server:14.0.4.Final
- container_name: infinispan
- ports:
- - "11222:11222"
- command: "-c infinispan-demo.xml"
- volumes:
- -
./infinispan/infinispan.xml:/opt/infinispan/server/conf/infinispan-demo.xml
- healthcheck:
- test: [ "CMD", "curl", "-f",
"http://localhost:11222/rest/v2/cache-managers/default/health/status"; ]
- interval: 1s
- timeout: 1s
- retries: 50
-
- jobs-service-all-in-one:
- image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
- container_name: jobs-service
- ports:
- - "8080:8080"
- depends_on:
- infinispan:
- condition: service_healthy
- environment:
- JOBS_SERVICE_PERSISTENCE: infinispan
- KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
- QUARKUS_INFINISPAN_CLIENT_HOSTS: infinispan:11222
- QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/container-compose-mongodb.yaml
b/contrib/jobs-service/container-compose-mongodb.yaml
deleted file mode 100644
index 531d4255..00000000
--- a/contrib/jobs-service/container-compose-mongodb.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# 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.
-#
-services:
- mongo:
- image: mongo
- container_name: mongo
- restart: always
- environment:
- MONGO_INITDB_ROOT_USERNAME: root
- MONGO_INITDB_ROOT_PASSWORD: example
-
- mongo-express:
- image: mongo-express
- container_name: mongo-express
- restart: always
- ports:
- - 8081:8081
- environment:
- ME_CONFIG_MONGODB_ADMINUSERNAME: root
- ME_CONFIG_MONGODB_ADMINPASSWORD: example
- ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
-
- jobs-service-all-in-one:
- image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
- container_name: jobs-service
- ports:
- - "8080:8080"
- depends_on:
- - mongo
- environment:
- JOBS_SERVICE_PERSISTENCE: mongodb
- QUARKUS_MONGODB_CONNECTION_STRING: mongodb://mongo:27017
- QUARKUS_MONGODB_DATABASE: kogito
- MONGODB_HOST: mongodb:27017
- QUARKUS_MONGODB_CREDENTIALS_USERNAME: root
- QUARKUS_MONGODB_CREDENTIALS_PASSWORD: example
- QUARKUS_MONGODB_CREDENTIALS_AUTH_SOURCE: admin
- KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/infinispan/infinispan.xml
b/contrib/jobs-service/infinispan/infinispan.xml
deleted file mode 100644
index 72667550..00000000
--- a/contrib/jobs-service/infinispan/infinispan.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<infinispan>
- <cache-container name="default"/>
- <server>
- <interfaces>
- <interface name='public'>
- <inet-address value='${infinispan.bind.address:0.0.0.0}'/>
- </interface>
- </interfaces>
- <socket-bindings default-interface='public' port-offset='0'>
- <socket-binding name='default' port='11222'/>
- </socket-bindings>
- <endpoints>
- <endpoint socket-binding='default'>
- <hotrod-connector name="hotrod"/>
- <rest-connector name="rest"/>
- </endpoint>
- </endpoints>
- </server>
-</infinispan>
\ No newline at end of file
diff --git a/kogito-jobs-service-allinone-image.yaml
b/kogito-jobs-service-allinone-image.yaml
index 6765bdaa..0db23c68 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -33,7 +33,7 @@ labels:
- name: "io.k8s.display-name"
value: "Kogito Jobs Service All-in-One"
- name: "io.openshift.tags"
- value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral"
+ value: "kogito,jobs-service,postgresql,ephemeral"
- name: "io.openshift.expose-services"
value: "8080:http"
@@ -45,8 +45,8 @@ envs:
example: "true"
description: "By default Jobs Service doesn't integrate with message
systems (e.g. Kafka). Set this variable to true to enable the events add-on."
- name: "JOBS_SERVICE_PERSISTENCE"
- example: "mongodb"
- description: "The all in one image contains all the supported jdbc plugins
for Jobs Service, ephemeral, postgresql, mongodb and infinispan, if empty,
defaults to ephemeral"
+ example: "postgresql"
+ description: "The all in one image contains all the supported jdbc plugins
for Jobs Service, ephemeral and postgresql, if empty, defaults to ephemeral"
packages:
manager: microdnf
diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
index 750845d0..43fc15e1 100644
--- a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
@@ -30,7 +30,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
printenv
fi
-allowed_jobs_service_flavors=("ephemeral" "mongodb" "infinispan" "postgresql")
+allowed_jobs_service_flavors=("ephemeral" "postgresql")
jobs_service_flavor="ephemeral"
if [[ ! "${allowed_jobs_service_flavors[*]}" =~ ${JOBS_SERVICE_PERSISTENCE,,}
]]; then
log_warning "${JOBS_SERVICE_PERSISTENCE,,} is not supported, the allowed
flavors are [${allowed_jobs_service_flavors[*]}], defaulting to
${jobs_service_flavor}"
diff --git a/modules/kogito-jobs-service-all-in-one/configure
b/modules/kogito-jobs-service-all-in-one/configure
index d77d57dc..6777f480 100644
--- a/modules/kogito-jobs-service-all-in-one/configure
+++ b/modules/kogito-jobs-service-all-in-one/configure
@@ -24,8 +24,6 @@ SCRIPT_DIR=$(dirname "${0}")
ADDED_DIR="${SCRIPT_DIR}"/added
unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d
"${KOGITO_HOME}"/bin/ephemeral
-unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d
"${KOGITO_HOME}"/bin/infinispan
-unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d
"${KOGITO_HOME}"/bin/mongodb
unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d
"${KOGITO_HOME}"/bin/postgresql
@@ -35,14 +33,6 @@ mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/*
"${KOGITO_HOME}"/bin/shared-
rm -rf "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
ln -s "${KOGITO_HOME}"/bin/shared-libs
"${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
-cp -r "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib/*
"${KOGITO_HOME}"/bin/shared-libs/
-rm -rf "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
-ln -s "${KOGITO_HOME}"/bin/shared-libs
"${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
-
-cp -r "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib/*
"${KOGITO_HOME}"/bin/shared-libs/
-rm -rf "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
-ln -s "${KOGITO_HOME}"/bin/shared-libs
"${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
-
cp -r "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/*
"${KOGITO_HOME}"/bin/shared-libs/
rm -rf "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
ln -s "${KOGITO_HOME}"/bin/shared-libs
"${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml
b/modules/kogito-jobs-service-all-in-one/module.yaml
index 0886aa3f..aa890d32 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -23,10 +23,6 @@ version: "999-SNAPSHOT"
artifacts:
- path:
/tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
name: jobs-service-inmemory-quarkus-app.zip
- - path:
/tmp/build/jobs-service-mongodb-all-in-one/jobs-service-mongodb-quarkus-app.zip
- name: jobs-service-mongodb-quarkus-app.zip
- - path:
/tmp/build/jobs-service-infinispan-all-in-one/jobs-service-infinispan-quarkus-app.zip
- name: jobs-service-infinispan-quarkus-app.zip
- path:
/tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip
name: jobs-service-postgresql-quarkus-app.zip
diff --git a/scripts/build-kogito-apps-components.sh
b/scripts/build-kogito-apps-components.sh
index 24f7187d..ddaada7d 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -72,9 +72,7 @@ case ${imageName} in
"kogito-jobs-service-allinone")
extended_context="-all-in-one"
contextDir="jobs-service/jobs-service-inmemory"
- contextDir="${contextDir} jobs-service/jobs-service-infinispan"
contextDir="${contextDir} jobs-service/jobs-service-postgresql"
- contextDir="${contextDir} jobs-service/jobs-service-mongodb"
;;
"kogito-jit-runner")
contextDir="jitexecutor/jitexecutor-runner"
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 636c458f..39541519 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -7,14 +7,12 @@ Feature: Kogito-jobs-service-all-in-one feature.
And the image should contain label io.openshift.expose-services with value
8080:http
And the image should contain label io.k8s.description with value Runtime
image for Kogito Jobs Service with all available jdbc providers
And the image should contain label io.k8s.display-name with value Kogito
Jobs Service All-in-One
- And the image should contain label io.openshift.tags with value
kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral
+ And the image should contain label io.openshift.tags with value
kogito,jobs-service,postgresql,ephemeral
Scenario: Verify if all jobs-service flavors are in the image
When container is started with command bash
Then file /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar should
exist
- And file /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar should
exist
And file /home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar should
exist
- And file /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar should exist
Scenario: Verify if the debug is correctly enabled with the ephemeral jar
When container is started with env
@@ -24,43 +22,13 @@ Feature: Kogito-jobs-service-all-in-one feature.
And container log should contain started in
And container log should not contain Application failed to start
- Scenario: Infinispan - verify if auth is correctly set
- When container is started with env
- | variable | value |
- | SCRIPT_DEBUG | true |
- | JOBS_SERVICE_PERSISTENCE | infinispan |
- | QUARKUS_INFINISPAN_CLIENT_HOSTS | 172.18.0.1:11222 |
- | QUARKUS_INFINISPAN_CLIENT_USE_AUTH | true |
- | QUARKUS_INFINISPAN_CLIENT_USERNAME | IamNotExist |
- | QUARKUS_INFINISPAN_CLIENT_PASSWORD | hard2guess |
- | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM | SecretRealm |
- | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM | COOLGSSAPI |
- Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar
/home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
- And container log should contain
QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
- And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
- And container log should contain
QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
- And container log should contain
QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
- And container log should contain
QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
- And container log should contain
QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
- And container log should not contain Application failed to start
-
- Scenario: verify if the container is correctly started with mongo parameters
- When container is started with env
- | variable | value
|
- | SCRIPT_DEBUG | true
|
- | JOBS_SERVICE_PERSISTENCE | mongodb
|
- | QUARKUS_MONGODB_CONNECTION_STRING |
mongodb://user:password@localhost:27017/admin |
- | QUARKUS_MONGODB_DATABASE | kogito
|
- Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar
/home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
- And container log should not contain Application failed to start
-
Scenario: verify if the container is started with invalid jobs-service flavor
When container is started with env
| variable | value |
| SCRIPT_DEBUG | true |
| JOBS_SERVICE_PERSISTENCE | something |
Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar
/home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar
- And container log should contain something is not supported, the allowed
flavors are [ephemeral mongodb infinispan postgresql], defaulting to ephemeral
+ And container log should contain something is not supported, the allowed
flavors are [ephemeral postgresql], defaulting to ephemeral
Scenario: verify if container starts as expected
When container is started with env
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
