Skip to content

Commit 7918a57

Browse files
ricardozaninidomhanak
authored andcommitted
Fix kie-issues #1217 Remove infinispan based images from a few examples (#1927)
* Remove infinispan based images from a few examples Signed-off-by: Ricardo Zanini <zanini@redhat.com> * Remove Infinispan from ocp-tryout Signed-off-by: Ricardo Zanini <zanini@redhat.com> --------- Signed-off-by: Ricardo Zanini <zanini@redhat.com>
1 parent 184dd72 commit 7918a57

File tree

144 files changed

+306
-5509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+306
-5509
lines changed

.ci/jenkins/Jenkinsfile.setup-branch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pipeline {
137137
String[] versionSplit = getKogitoVersion().split("\\.")
138138
String reducedTag = "${versionSplit[0]}.${versionSplit[1]}"
139139
sh """
140-
grep -r -l --exclude-dir=.ci 'quay.io/kiegroup' | xargs -I{} sed -i 's|quay.io/kiegroup/\\(.*\\):.*|quay.io/kiegroup/\\1:${reducedTag}|g' {}
140+
grep -r -l --exclude-dir=.ci 'docker.io/apache/incubator-kie-' | xargs -I{} sed -i 's|docker.io/apache/incubator-kie-\\(.*\\):.*|docker.io/apache/incubator-kie-\\1:${reducedTag}|g' {}
141141
"""
142142
}
143143
}

kogito-quarkus-examples/dmn-tracing-quarkus/Dockerfile

Lines changed: 0 additions & 31 deletions
This file was deleted.

kogito-quarkus-examples/dmn-tracing-quarkus/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,5 @@ Example response:
135135
## Integration example with Trusty Service
136136

137137
When the tracing addon is enabled, the tracing events are emitted and pushed to a Kafka broker. The [Trusty Service](https://github.com/apache/incubator-kie-kogito-apps/tree/main/trusty) can consume such events and store them on a storage. The Trusty Service exposes then some api to consume the information that has been collected.
138-
A `docker-compose` example is provided in the current folder. In particular, when `docker-compose up` is run, a Kafka broker, an Infinispan container and the latest build of the trusty service configured to use Infinispan are deployed.
139-
Once the services are up and running, after a decision has been evaluated, you can access the trusty service API to list the evaluations at `localhost:8081/executions` for example.
138+
140139

kogito-quarkus-examples/dmn-tracing-quarkus/docker-compose.yml

Lines changed: 0 additions & 77 deletions
This file was deleted.

kogito-quarkus-examples/dmn-tracing-quarkus/docker-compose/infinispan/infinispan.xml

Lines changed: 0 additions & 39 deletions
This file was deleted.

kogito-quarkus-examples/kogito-travel-agency/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and to start any any place.
1818
Consists of single service that has both business logic and decision logic included.
1919

2020
[Travel agency and visa services with persistence](extended) - deals with all the basic steps to book flight and hotel.
21-
Consists of two services that have both business logic and decision logic included. Preserves data between service restarts and requires Infinispan server to be available.
21+
Consists of two services that have both business logic and decision logic included. Preserves data between service restarts and requires PostgreSQL server to be available.
2222

2323
## Contribution
2424

kogito-quarkus-examples/kogito-travel-agency/extended/docker-compose/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Kogito and Infrastructure services
22

33
To allow a quick setup of all services required to run this demo, we provide a docker compose template that starts the following services:
4-
- Infinispan
4+
- PostgreSQL
55
- Kafka
66
- Prometheus
77
- Grafana
@@ -33,7 +33,7 @@ In order to use it, please ensure you have Docker Compose installed on your mach
3333
docker-compose up
3434

3535
Once all services bootstrap, the following ports will be assigned on your local machine:
36-
- Infinispan: 11222
36+
- PostgreSQL: 5432
3737
- Kafka: 9092
3838
- Prometheus: 9090
3939
- Grafana: 3000

kogito-quarkus-examples/kogito-travel-agency/extended/docker-compose/docker-compose.yml

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,31 @@ version: '2.1'
2121

2222
services:
2323

24-
infinispan:
25-
image: infinispan/server:14.0.4.Final
26-
container_name: infinispan
24+
postgres:
25+
image: postgres:13.4-alpine3.14
2726
ports:
28-
- "11222:11222"
29-
command: "-c infinispan-demo.xml"
27+
- "5432:5432"
3028
volumes:
31-
- ./infinispan/infinispan.xml:/opt/infinispan/server/conf/infinispan-demo.xml:z
29+
- ./sql:/docker-entrypoint-initdb.d/
3230
healthcheck:
33-
test: [ "CMD", "curl", "-f", "http://localhost:11222/rest/v2/cache-managers/default/health/status" ]
34-
interval: 1s
35-
timeout: 1s
31+
test: [ "CMD", "pg_isready", "-q", "-d", "kogito", "-U", "kogito-user" ]
32+
timeout: 45s
33+
interval: 10s
3634
retries: 50
35+
environment:
36+
- POSTGRES_USER=postgres
37+
- POSTGRES_PASSWORD=postgres
38+
39+
pgadmin-compose:
40+
image: dpage/pgadmin4:5.0
41+
environment:
42+
PGADMIN_DEFAULT_EMAIL: user@user.org
43+
PGADMIN_DEFAULT_PASSWORD: pass
44+
ports:
45+
- 8055:80
46+
depends_on:
47+
- postgres
48+
container_name: pgadmin-container
3749

3850
zookeeper:
3951
container_name: zookeeper
@@ -110,26 +122,27 @@ services:
110122

111123
data-index:
112124
container_name: data-index
113-
image: quay.io/kiegroup/kogito-data-index-infinispan:10.0
125+
image: docker.io/apache/incubator-kie-kogito-data-index-postgresql:${KOGITO_VERSION}
114126
ports:
115127
- "8180:8080"
116128
depends_on:
117129
kafka:
118130
condition: service_started
119-
infinispan:
131+
postgres:
120132
condition: service_healthy
121133
volumes:
122134
- ./target/protobuf:/home/kogito/data/protobufs/
123135
environment:
124-
QUARKUS_INFINISPAN_CLIENT_HOSTS: infinispan:11222
125-
QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false"
126-
QUARKUS_HTTP_CORS_ORIGINS: "/.*/"
136+
QUARKUS_DATASOURCE_JDBC_URL: "jdbc:postgresql://postgres:5432/kogito"
137+
QUARKUS_DATASOURCE_USERNAME: kogito-user
138+
QUARKUS_DATASOURCE_PASSWORD: kogito-pass
127139
KAFKA_BOOTSTRAP_SERVERS: kafka:29092
128-
KOGITO_DATA_INDEX_PROPS: -Dkogito.protobuf.folder=/home/kogito/data/protobufs/
140+
QUARKUS_HTTP_CORS_ORIGINS: "/.*/"
141+
KOGITO_DATA_INDEX_PROPS: -Dquarkus.hibernate-orm.database.generation=update
129142

130143
management-console:
131144
container_name: management-console
132-
image: quay.io/kiegroup/kogito-management-console:10.0
145+
image: docker.io/apache/incubator-kie-kogito-management-console:${KOGITO_VERSION}
133146
ports:
134147
- 8280:8080
135148
depends_on:
@@ -146,7 +159,7 @@ services:
146159

147160
task-console:
148161
container_name: task-console
149-
image: quay.io/kiegroup/kogito-task-console:10.0
162+
image: docker.io/apache/incubator-kie-kogito-task-console:${KOGITO_VERSION}
150163
ports:
151164
- 8380:8080
152165
depends_on:
@@ -157,4 +170,4 @@ services:
157170
environment:
158171
KOGITO_DATAINDEX_HTTP_URL: http://${DOCKER_GATEWAY_HOST:-host.docker.internal}:8180/graphql
159172
KOGITO_TASK_CONSOLE_PROPS: -Dkogito.consoles.keycloak.config.url=http://localhost:8480/auth -Dkogito.consoles.keycloak.config.health-check-url=http://localhost:8480/auth/realms/kogito/.well-known/openid-configuration
160-
QUARKUS_HTTP_CORS_ORIGINS: "/.*/"
173+
QUARKUS_HTTP_CORS_ORIGINS: "/.*/"

kogito-quarkus-examples/kogito-travel-agency/extended/docker-compose/infinispan/infinispan.xml

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
CREATE ROLE "kogito-user" WITH
2+
LOGIN
3+
SUPERUSER
4+
INHERIT
5+
CREATEDB
6+
CREATEROLE
7+
NOREPLICATION
8+
PASSWORD 'kogito-pass';
9+
10+
CREATE DATABASE kogito
11+
WITH
12+
OWNER = "kogito-user"
13+
ENCODING = 'UTF8'
14+
LC_COLLATE = 'en_US.utf8'
15+
LC_CTYPE = 'en_US.utf8'
16+
TABLESPACE = pg_default
17+
CONNECTION LIMIT = -1;
18+
19+
GRANT ALL PRIVILEGES ON DATABASE kogito TO "kogito-user";
20+
GRANT ALL PRIVILEGES ON DATABASE kogito TO postgres;

0 commit comments

Comments
 (0)