Skip to content

Commit a8efad5

Browse files
ljmottajomarko
authored andcommitted
kie-issues#1599: Remove Task Console usage from kogito-examples (apache#2033)
* Remove all Task Console references * change to quay.io * Update README * Rollback to docker.io * Minor changes * Use localhost instead of docker host ip * Trigger build --------- Co-authored-by: Jozef Marko <[email protected]>
1 parent 9323888 commit a8efad5

35 files changed

+39
-258
lines changed

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

-17
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,9 @@ services:
135135
depends_on:
136136
data-index:
137137
condition: service_started
138-
keycloak:
139-
condition: service_healthy
140138
volumes:
141139
- ./svg/:/home/kogito/data/svg/
142140
environment:
143141
KOGITO_DATAINDEX_HTTP_URL: http://${DOCKER_GATEWAY_HOST:-host.docker.internal}:8180/graphql
144142
KOGITO_MANAGEMENT_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 -Dkogito.svg.folder.path=/home/kogito/data/svg
145143
QUARKUS_HTTP_CORS_ORIGINS: "/.*/"
146-
147-
task-console:
148-
container_name: task-console
149-
image: quay.io/kiegroup/kogito-task-console:${KOGITO_VERSION}
150-
ports:
151-
- 8380:8080
152-
depends_on:
153-
data-index:
154-
condition: service_started
155-
keycloak:
156-
condition: service_healthy
157-
environment:
158-
KOGITO_DATAINDEX_HTTP_URL: http://${DOCKER_GATEWAY_HOST:-host.docker.internal}:8180/graphql
159-
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: "/.*/"

kogito-quarkus-examples/kogito-travel-agency/extended/docker-compose/keycloak/kogito-realm.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -816,15 +816,14 @@
816816
},
817817
{
818818
"clientId": "kogito-console-quarkus",
819-
"rootUrl": "http://localhost:8380",
820-
"adminUrl": "http://localhost:8380/",
821-
"baseUrl": "http://localhost:8380/",
819+
"rootUrl": "http://localhost:8280",
820+
"adminUrl": "http://localhost:8280/",
821+
"baseUrl": "http://localhost:8280/",
822822
"surrogateAuthRequired": false,
823823
"enabled": true,
824824
"clientAuthenticatorType": "client-secret",
825825
"secret": "**********",
826826
"redirectUris": [
827-
"http://localhost:8380/*",
828827
"http://localhost:8280/*"
829828
],
830829
"webOrigins": [

kogito-quarkus-examples/kogito-travel-agency/extended/docker-compose/startServices.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
#
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file

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

+9-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ the response with the visa processing outcome - approved or rejected.
1313
* Create project using Quarkus Maven plugin with following extensions
1414
* Kogito
1515
* OpenApi
16-
* Import project into Eclipse IDE - requires BPMN modeller plugin installed
1716
* Create data model
1817
* Traveller
1918
* Hotel
@@ -134,16 +133,16 @@ You should start all the services before you execute any of the **Hiring** examp
134133
For Linux and MacOS:
135134

136135
1. Open a Terminal
137-
2. Go to the process-usertasks-quarkus-with-console folder at kogito-examples
136+
2. Go to the kogito-travel-agency folder at kogito-examples
138137

139138
```bash
140-
cd <path_to_process-usertasks-quarkus-with-console>/docker-compose
139+
cd <path_to_kogito-travel-agency>/docker-compose
141140
```
142141

143142
3. Run the ```startServices.sh``` script
144143

145144
```bash
146-
sh ./startServices.sh
145+
./startServices.sh
147146
```
148147

149148
Once all services bootstrap, the following ports will be assigned on your local machine:
@@ -173,6 +172,12 @@ It will install the *Kogito Realm* that comes with a predefined set of users:
173172

174173
Once Keycloak is started, you should be able to access your *Keycloak Server* at [localhost:8480/auth](http://localhost:8480/auth) with *admin* user.
175174

175+
### Compile and Start the process
176+
177+
```
178+
mvn clean package
179+
java -jar target/quarkus-app/quarkus-run.jar
180+
```
176181

177182
### Compile and Run in Local Dev Mode
178183

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

+10-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ will add additional handling to the approved or rejected visa applications _(by
1818
* Create project using Quarkus Maven plugin with following extensions
1919
* Kogito
2020
* OpenApi
21-
* Import project into Eclipse IDE - requires BPMN modeller plugin installed
2221
* Create data model
2322
* VisaApplication
2423
* Create decision logic
@@ -78,16 +77,16 @@ You should start all the services before you execute any of the **Hiring** examp
7877
For Linux and MacOS:
7978

8079
1. Open a Terminal
81-
2. Go to the process-usertasks-quarkus-with-console folder at kogito-examples
80+
2. Go to the kogito-travel-agency folder at kogito-examples
8281

8382
```bash
84-
cd <path_to_process-usertasks-quarkus-with-console>/docker-compose
83+
cd <path_to_kogito-travel-agency>/docker-compose
8584
```
8685

8786
3. Run the ```startServices.sh``` script
8887

8988
```bash
90-
sh ./startServices.sh
89+
./startServices.sh
9190
```
9291

9392
Once all services bootstrap, the following ports will be assigned on your local machine:
@@ -117,6 +116,13 @@ It will install the *Kogito Realm* that comes with a predefined set of users:
117116

118117
Once Keycloak is started, you should be able to access your *Keycloak Server* at [localhost:8480/auth](http://localhost:8480/auth) with *admin* user.
119118

119+
### Compile and Start the process
120+
121+
```
122+
mvn clean package
123+
java -jar target/quarkus-app/quarkus-run.jar
124+
```
125+
120126
### Compile and Run in Local Dev Mode
121127

122128
```

kogito-quarkus-examples/ocp-tryout/README.md

-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Installation from pre-build images
2626
- [Data Index](https://docs.jboss.org/kogito/release/1.15.0/html_single/#con-data-index-service_kogito-configuring)
2727
- [Management console](https://docs.jboss.org/kogito/release/1.15.0/html_single/#con-management-console_kogito-developing-process-services)
2828
- [Jobs service](https://docs.jboss.org/kogito/release/latest/html_single/#con-jobs-service_kogito-configuring)
29-
- [Task console](https://docs.jboss.org/kogito/release/latest/html_single/#con-task-console_kogito-developing-process-services)
3029

3130
## Architecture
3231
![](./architecture.png)
@@ -86,8 +85,6 @@ All configuration required to make those connections as well as initializations
8685
- `kogito.dataindex.wsurl` - the dataindex url, protocol: ws
8786
### Kogito Management Console Configurations
8887
- `kogito.managementconsole.props` - command line properties for the management console
89-
### Kogito Task Console Configurations
90-
- `kogito.taskconsole.props` - command line properties for the task console
9188
### Kogito Job Service Configurations
9289
- `kogito.jobsservice.props` - command line properties for the job service
9390
@@ -103,7 +100,6 @@ if marked `-` then namespace defaults are applied
103100
|keycloak|-|-|-|-|
104101
|kogito-data-index-infinispan|-|-|-|500Mi|
105102
|kogito-management-console|-|-|-|500Mi|
106-
|kogito-task-console|-|-|-|500Mi|
107103
|kogito-jobs-service|-|-|-|500Mi|
108104
|kogito-travel-agency-travels-jvm|-|-|-|500Mi|
109105
|kogito-travel-agency-visas-jvm|-|-|-|500Mi|

kogito-quarkus-examples/ocp-tryout/installer.properties

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ KAFKA=N
3232
KEYCLOAK=N
3333
KOGITO_DATA_INDEX=N
3434
KOGITO_MANAGEMENT_CONSOLE=N
35-
KOGITO_TASK_CONSOLE=N
3635
KOGITO_JOBS_SERVICE=N
3736
TEST_APP=N
3837

kogito-quarkus-examples/ocp-tryout/installer.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source common-functions.sh
2929
action=install
3030

3131
components=(SHARED_CONFIG INFINISPAN KAFKA KEYCLOAK \
32-
KOGITO_DATA_INDEX KOGITO_MANAGEMENT_CONSOLE KOGITO_TASK_CONSOLE KOGITO_JOBS_SERVICE \
32+
KOGITO_DATA_INDEX KOGITO_MANAGEMENT_CONSOLE KOGITO_JOBS_SERVICE \
3333
TEST_APP)
3434
# override the installer properties configuration if needed
3535
function overrideEnvVariables(){
@@ -111,7 +111,6 @@ function install(){
111111

112112
componentAction "${KOGITO_DATA_INDEX}" "kogito-data-index" "${dbType}"
113113
componentAction "${KOGITO_MANAGEMENT_CONSOLE}" "kogito-management-console"
114-
componentAction "${KOGITO_TASK_CONSOLE}" "kogito-task-console"
115114
componentAction "${KOGITO_JOBS_SERVICE}" "kogito-jobs-service" "${dbType}"
116115

117116
componentAction "${TEST_APP}" "testapp"

kogito-quarkus-examples/ocp-tryout/keycloak/keycloak.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ action=$1
2424
# NOTE: if need to update kogito_realm.json, edit content of kogito-realm-orig.json here
2525
function updateClientRedirectUrls(){
2626
mngConsole=\"http://kogito-management-console-$(getProjectName).$(getClusterAppsHostname)/*\"
27-
taskConsole=\"http://kogito-task-console-$(getProjectName).$(getClusterAppsHostname)/*\"
28-
additionalRedirectUris=["${mngConsole}","${taskConsole}"]
27+
additionalRedirectUris=["${mngConsole}"]
2928
(jq '(.clients[] | select(.clientId=="kogito-console-quarkus") | .redirectUris) |= . + '${additionalRedirectUris} kogito-realm-orig.json) > kogito-realm.json
3029
}
3130
updateClientRedirectUrls

kogito-quarkus-examples/ocp-tryout/keycloak/kogito-realm-orig.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -816,15 +816,14 @@
816816
},
817817
{
818818
"clientId": "kogito-console-quarkus",
819-
"rootUrl": "http://localhost:8380",
820-
"adminUrl": "http://localhost:8380/",
821-
"baseUrl": "http://localhost:8380/",
819+
"rootUrl": "http://localhost:8280",
820+
"adminUrl": "http://localhost:8280/",
821+
"baseUrl": "http://localhost:8280/",
822822
"surrogateAuthRequired": false,
823823
"enabled": true,
824824
"clientAuthenticatorType": "client-secret",
825825
"secret": "**********",
826826
"redirectUris": [
827-
"http://localhost:8380/*",
828827
"http://localhost:8280/*"
829828
],
830829
"webOrigins": [

kogito-quarkus-examples/ocp-tryout/kogito-shared/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,5 @@ There is one config map per infrastructure component.
2323
- `kogito.dataindex.wsurl` - the dataindex url, protocol: ws
2424
#### Kogito Management Console Config
2525
- `kogito.managementconsole.props` - command line properties for the management console
26-
#### Kogito Task Console Config
27-
- `kogito.taskconsole.props` - command line properties for the task console
2826
#### Kogito Job Service Config
2927
- `kogito.jobsservice.props` - command line properties for the job service

kogito-quarkus-examples/ocp-tryout/kogito-shared/kogito-configs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ data:
3636
kogito.dataindex.httpurl.with.graphql: 'http://kogito-data-index-infinispan-${project_name}.${apps_cluster_host}/graphql'
3737
kogito.dataindex.wsurl: 'ws://kogito-data-index-infinispan-${project_name}.${apps_cluster_host}'
3838
kogito.managementconsole.props: '-Dkogito.svg.folder.path=/home/kogito/data/svg -Dkogito.consoles.keycloak.config.url=http://keycloak-${project_name}.${apps_cluster_host}/auth/ -Dkogito.consoles.keycloak.config.health-check-url=http://keycloak-${project_name}.${apps_cluster_host}/auth/realms/kogito/.well-known/openid-configuration'
39-
kogito.taskconsole.props: '-Dkogito.test.user-system.enabled=true -Dkogito.consoles.keycloak.config.url=http://keycloak-${project_name}.${apps_cluster_host}/auth/ -Dkogito.consoles.keycloak.config.health-check-url=http://keycloak-${project_name}.${apps_cluster_host}/auth/realms/kogito/.well-known/openid-configuration'
4039
kogito.jobsservice.props: '-Dquarkus-profile=events-support -D%events-support.kafka.bootstrap.servers=kafka.${project_name}.svc.cluster.local:9092 -D%events-support.mp.messaging.outgoing.kogito-job-service-job-status-events.bootstrap.servers=kafka.${project_name}.svc.cluster.local:9092'

kogito-quarkus-examples/ocp-tryout/kogito-task-console/deployment-patch.yaml

-42
This file was deleted.

kogito-quarkus-examples/ocp-tryout/kogito-task-console/kogito-task-console.sh

-37
This file was deleted.

kogito-quarkus-examples/ocp-tryout/uninstaller.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ source common-functions.sh
2525
action=uninstall
2626

2727
components=(SHARED_CONFIG INFINISPAN KAFKA KEYCLOAK \
28-
KOGITO_DATA_INDEX KOGITO_MANAGEMENT_CONSOLE KOGITO_TASK_CONSOLE KOGITO_JOBS_SERVICE \
28+
KOGITO_DATA_INDEX KOGITO_MANAGEMENT_CONSOLE KOGITO_JOBS_SERVICE \
2929
TEST_APP)
3030
# override the installer properties configuration if needed
3131
function overrideEnvVariables(){
@@ -74,7 +74,6 @@ function uninstall(){
7474

7575
componentAction "${KOGITO_DATA_INDEX}" "kogito-data-index" "${dbType}"
7676
componentAction "${KOGITO_MANAGEMENT_CONSOLE}" "kogito-management-console"
77-
componentAction "${KOGITO_TASK_CONSOLE}" "kogito-task-console"
7877
componentAction "${KOGITO_JOBS_SERVICE}" "kogito-jobs-service" "${dbType}"
7978

8079
componentAction "${INFINISPAN}" "infinispan"

kogito-quarkus-examples/process-instance-migration-quarkus/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The Development Mode will embed all the needed Infrastructure Services (PostgreS
9696
require any extra step.
9797

9898
The `development` profile includes the **Runtime Tools Quarkus Extension** that exposes a new section in the **Quarkus Dev-UI**
99-
unifying the **Management Console** & **Task Console** functionalities. **Quarkus Dev-UI** is available at http://localhost:8080/q/dev
99+
with the **Management Console** functionalities. **Quarkus Dev-UI** is available at http://localhost:8080/q/dev
100100

101101
> **_NOTE:_** For more information about how to work with Kogito Runtime Tools Quarkus Extension, please refer to the [Kogito Documentation](https://docs.kogito.kie.org/latest/html_single/#con-runtime-tools-dev-ui_kogito-developing-process-services) page.
102102

0 commit comments

Comments
 (0)