kie-kogito-examples-1856: serverless-workflow-timeouts-showcase-exten…

…ded updates after Quarkus3 migration (apache#1857)
kiegroup · Jan 25, 2024 · 5b71dad · 5b71dad
1 parent 92ce81d
commit 5b71dad
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 18 deletions.
diff --git a/...less-workflow-examples/serverless-workflow-timeouts-showcase-extended/README.md b/...less-workflow-examples/serverless-workflow-timeouts-showcase-extended/README.md
@@ -105,7 +105,12 @@ kubectl apply -f kubernetes/data-index-service-postgresql.yml -n timeouts-showca
 
 service/data-index-service-postgresql created
 deployment.apps/data-index-service-postgresql created
-trigger.eventing.knative.dev/data-index-service-postgresql-processes-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-definition-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-error-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-node-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-sla-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-state-trigger created
+trigger.eventing.knative.dev/data-index-service-postgresql-process-variable-trigger created
 trigger.eventing.knative.dev/data-index-service-postgresql-jobs-trigger created
 ```
 

diff --git a/...rverless-workflow-timeouts-showcase-extended/kubernetes/data-index-service-postgresql.yml b/...rverless-workflow-timeouts-showcase-extended/kubernetes/data-index-service-postgresql.yml
@@ -62,6 +62,8 @@ spec:
               name: http
               protocol: TCP
           env:
+            - name: KOGITO_SERVICE_URL
+              value: http://data-index-service-postgresql
             - name: KUBERNETES_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -76,7 +78,7 @@ spec:
               value: postgresql
             - name: QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION
               value: update
-            - name: QUARKUS_KAFKA_HEALTH_ENABLE
+            - name: QUARKUS_SMALLRYE_HEALTH_CHECK__IO_QUARKUS_KAFKA_CLIENT_HEALTH_KAFKAHEALTHCHECK__ENABLED
               value: "false"
             - name: QUARKUS_HTTP_CORS
               value: "true"
@@ -92,12 +94,92 @@ spec:
 apiVersion: eventing.knative.dev/v1
 kind: Trigger
 metadata:
-  name: data-index-service-postgresql-processes-trigger
+  name: data-index-service-postgresql-process-definition-trigger
 spec:
   broker: default
   filter:
     attributes:
-      type: ProcessInstanceEvent
+      type: ProcessDefinitionEvent
+  subscriber:
+    ref:
+      apiVersion: v1
+      kind: Service
+      name: data-index-service-postgresql
+    uri: /definitions
+---
+apiVersion: eventing.knative.dev/v1
+kind: Trigger
+metadata:
+  name: data-index-service-postgresql-process-error-trigger
+spec:
+  broker: default
+  filter:
+    attributes:
+      type: ProcessInstanceErrorDataEvent
+  subscriber:
+    ref:
+      apiVersion: v1
+      kind: Service
+      name: data-index-service-postgresql
+    uri: /processes
+---
+apiVersion: eventing.knative.dev/v1
+kind: Trigger
+metadata:
+  name: data-index-service-postgresql-process-node-trigger
+spec:
+  broker: default
+  filter:
+    attributes:
+      type: ProcessInstanceNodeDataEvent
+  subscriber:
+    ref:
+      apiVersion: v1
+      kind: Service
+      name: data-index-service-postgresql
+    uri: /processes
+---
+apiVersion: eventing.knative.dev/v1
+kind: Trigger
+metadata:
+  name: data-index-service-postgresql-process-sla-trigger
+spec:
+  broker: default
+  filter:
+    attributes:
+      type: ProcessInstanceSLADataEvent
+  subscriber:
+    ref:
+      apiVersion: v1
+      kind: Service
+      name: data-index-service-postgresql
+    uri: /processes
+---
+apiVersion: eventing.knative.dev/v1
+kind: Trigger
+metadata:
+  name: data-index-service-postgresql-process-state-trigger
+spec:
+  broker: default
+  filter:
+    attributes:
+      type: ProcessInstanceStateDataEvent
+  subscriber:
+    ref:
+      apiVersion: v1
+      kind: Service
+      name: data-index-service-postgresql
+    uri: /processes
+---
+apiVersion: eventing.knative.dev/v1
+kind: Trigger
+metadata:
+  name: data-index-service-postgresql-process-variable-trigger
+spec:
+  broker: default
+  filter:
+    attributes:
+      type: ProcessInstanceVariableDataEvent
   subscriber:
     ref:
       apiVersion: v1

diff --git a/...les/serverless-workflow-timeouts-showcase-extended/kubernetes/jobs-service-postgresql.yml b/...les/serverless-workflow-timeouts-showcase-extended/kubernetes/jobs-service-postgresql.yml
@@ -92,6 +92,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: KOGITO_SERVICE_URL
+              value: http://jobs-service-postgresql
             - name: KOGITO_JOBS_SERVICE_HTTP_JOB_STATUS_CHANGE_EVENTS
               value: "true"
             - name: JOBS_SERVICE_PERSISTENCE

diff --git a/serverless-workflow-examples/serverless-workflow-timeouts-showcase-extended/pom.xml b/serverless-workflow-examples/serverless-workflow-timeouts-showcase-extended/pom.xml
@@ -44,7 +44,7 @@
     <kogito.bom.group-id>org.kie.kogito</kogito.bom.group-id>
     <kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
     <kogito.bom.version>999-SNAPSHOT</kogito.bom.version>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <version.compiler.plugin>3.8.1</version.compiler.plugin>
     <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
     <version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>

diff --git a/...ow-examples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.jvm b/...ow-examples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.jvm
@@ -75,9 +75,9 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
 
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+ENV LANGUAGE='en_US:en'
 
 
 # We make four distinct layers so if there are application changes the library layers can be re-used
@@ -88,7 +88,8 @@ COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+
diff --git a/...ples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.legacy-jar b/...ples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.legacy-jar
@@ -75,16 +75,17 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
 
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+ENV LANGUAGE='en_US:en'
 
 
 COPY target/lib/* /deployments/lib/
 COPY target/*-runner.jar /deployments/quarkus-run.jar
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
diff --git a/...examples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.native b/...examples/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/serverless-workflow-timeouts-showcase-extended
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
@@ -24,4 +24,4 @@ COPY --chown=1001:root target/*-runner /work/application
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/...es/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.native-micro b/...es/serverless-workflow-timeouts-showcase-extended/src/main/docker/Dockerfile.native-micro
@@ -17,7 +17,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/serverless-workflow-timeouts-showcase-extended
 #
 ###
-FROM quay.io/quarkus/quarkus-micro-image:1.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
@@ -27,4 +27,4 @@ COPY --chown=1001:root target/*-runner /work/application
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/...ess-workflow-timeouts-showcase-extended/src/main/resources/application-knative.properties b/...ess-workflow-timeouts-showcase-extended/src/main/resources/application-knative.properties
@@ -42,12 +42,15 @@ mp.messaging.outgoing.kogito-job-service-job-request-events.connector=quarkus-ht
 mp.messaging.outgoing.kogito-job-service-job-request-events.url=${K_SINK:http://localhost:8280/v2/jobs/events}
 mp.messaging.outgoing.kogito-job-service-job-request-events.method=POST
 
+# The name of the application. This value will be used for naming Kubernetes resources like: Deployment, Service,  etc.
+quarkus.knative.name=timeouts-showcase-extended
+
 # This enables Knative to fetch the image information on Minikube.
 # You can change this property with -Pknative -Dquarkus.container-image.group from the command line.
 quarkus.container-image.build=true
 quarkus.container-image.registry=dev.local
 quarkus.container-image.group=${USER}
-quarkus.container-image.name=timeouts-showcase-extended
+quarkus.container-image.name=${quarkus.knative.name}
 quarkus.kubernetes.deployment-target=knative
 quarkus.knative.image-pull-policy=if-not-present
 quarkus.knative.env.vars.postgres_host=timeouts-showcase-database