Merge pull request #1 from h3nrique/master

Update JDK and others improvements

Author: sleipnir

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: 'maven'
+
+    - name: Run tests
+      run: mvn compile test

.gitignore

@@ -1,3 +1,6 @@
 /.idea/
 /target
 /dependency-reduced-pom.xml
+*.iml
+/.vscode/
+.classpath

Dockerfile

@@ -1,13 +1,12 @@
-FROM maven:3-openjdk-17 as build
-LABEL authors="Paulo Henrique Alves <paulo.alves@fabricads.com.br>"
+FROM docker.io/library/maven:3-openjdk-17 as build
+LABEL authors="Paulo Henrique Alves <paulohenriqueas13@gmail.com>"
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 COPY . /usr/src
 RUN mvn clean install -DskipTests -Dmaven.javadoc.skip=true
 
-FROM openjdk:18
-LABEL authors="Paulo Henrique Alves <paulo.alves@fabricads.com.br>"
+FROM docker.io/library/openjdk:17
+LABEL authors="Paulo Henrique Alves <paulohenriqueas13@gmail.com>"
 EXPOSE 8091 8080
 COPY --from=build  /usr/src/target/postalcode-spawn-demo-shaded.jar  /opt/
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/opt/postalcode-spawn-demo-shaded.jar"]
-

README.md

@@ -1,18 +1,11 @@
-# Postalcode Spawn Dema
+# Postalcode Spawn Demo
 
 Java demo project using [Spawn](https://github.com/eigr/spawn) to find postal codes at [ViaCEP](https://viacep.com.br).
 
-## Locally start `Spawn Proxy` and some dependencies
+## Start environment
 
 ```bash
-docker network create spawn-demo
-docker-compose up mariadb nats spawn
-```
-
-## Start Java `ActorHost` application
-
-```bash
-docker-compose up app
+docker compose up
 ```
 
 ## Test
@@ -25,3 +18,32 @@ curl -v -H 'Content-Type: application/json' -d '{ "postalCode": "03694090" }' 'h
 curl -v 'http://localhost:8080/postalcode/03694090'
 ```
 
+## To deploy on Openshift with Openshift Pipeline (Tekton)
+
+```bash
+oc create ns spawn
+oc process openshift//mysql-persistent -p MYSQL_USER=admin -p MYSQL_PASSWORD=admin -p MYSQL_ROOT_PASSWORD=mypassword -p MYSQL_DATABASE=eigr | oc create -n spawn -f -
+oc create secret generic mysql-connection-secret -n eigr-functions --from-literal=database=eigr --from-literal=host='mysql.spawn.svc.cluster.local' --from-literal=port='3306' --from-literal=username='admin' --from-literal=password='admin' --from-literal=encryptionKey=$(openssl rand -base64 32)
+tee actorsystem.yaml << END
+apiVersion: spawn-eigr.io/v1
+kind: ActorSystem
+metadata:
+  name: spawn-demo
+  labels:
+    app: spawn-demo
+spec:
+#  selector:
+#    app: spawn-demo
+  statestore:
+    type: MySql
+    credentialsSecretRef: mysql-connection-secret
+    pool:
+      size: "10"
+END
+oc create -f actorsystem.yaml -n spawn
+oc create -f openshift-pipeline.yaml -n spawn
+oc create role actorhost-pipeline --verb='*' --resource='actorhosts,actorsystems' -n spawn
+oc create rolebinding actorhost-pipeline --role=actorhost-pipeline --serviceaccount=spawn:pipeline -n spawn
+# If you want to expose actor service with route command
+oc create route edge postalcode --service=postalcode-spawn-demo --port=8080
+```

docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   mariadb:
     image: mariadb
@@ -16,15 +14,11 @@ services:
       MYSQL_PASSWORD: admin
     volumes:
       - mariadb:/var/lib/mysql
-    networks:
-      - spawn-demo
     ports:
       - "3307:3306"
 
   nats:
     image: nats:2
-    networks:
-      - spawn-demo
     ports:
       - "8222:8222"
       - "4222:4222"
@@ -34,30 +28,28 @@ services:
 #      context: https://github.com/eigr/spawn.git#main
 #      dockerfile: ./Dockerfile-proxy
 #    image: spawn/proxy:main-localbuild
-    image: eigr/spawn-proxy:1.0.0-rc.19
+    image: eigr/spawn-proxy:1.4.1-rc.1
     environment:
       SPAWN_USE_INTERNAL_NATS: "false"
       SPAWN_PUBSUB_ADAPTER: nats
       SPAWN_PUBSUB_NATS_HOSTS: nats://nats:4222
       SPAWN_STATESTORE_KEY: 3Jnb0hZiHIzHTOih7t2cTEPEpY98Tu1wvQkPfq/XwqE=
-      PROXY_APP_NAME: spawn
+      PROXY_ACTOR_SYSTEM_NAME: spawn-system
       PROXY_CLUSTER_STRATEGY: gossip
       PROXY_DATABASE_PORT: 3306
       PROXY_DATABASE_TYPE: mariadb
       PROXY_DATABASE_HOST: mariadb
-      PROXY_HTTP_PORT: 9003
+      PROXY_HTTP_PORT: 9001
       USER_FUNCTION_PORT: 8091
       USER_FUNCTION_HOST: "app"
 #      USER_FUNCTION_HOST: "host.docker.internal" # Used when run app in localhost instead container.
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+#    extra_hosts:
+#      - "host.docker.internal:host-gateway" # Used when run app in localhost instead container.
     depends_on:
       mariadb:
         condition: service_healthy
-    networks:
-      - spawn-demo
     ports:
-      - "9003:9003"
+      - "9001:9001"
 
   app:
     build:
@@ -66,22 +58,16 @@ services:
     environment:
       ACTOR_PORT: 8091
       ACTOR_HOST: "app"
-      PROXY_PORT: 9003
-      PROXY_HOST: "spawn"
+      SPAWN_PROXY_PORT: 9001
+      SPAWN_PROXY_HOST: "spawn"
       SPAWN_SYSTEM_NAME: "spawn-system"
     depends_on:
       mariadb:
         condition: service_healthy
 #      spawn-proxy:
 #        condition: service_healthy
-    networks:
-      - spawn-demo
     ports:
       - "8080:8080"
 
-networks:
-  spawn-demo:
-    external: true
-
 volumes:
   mariadb:

k8s/actorhost.yaml

@@ -0,0 +1,27 @@
+apiVersion: spawn-eigr.io/v1
+kind: ActorHost
+metadata:
+  labels:
+    app: postalcode-spawn-demo
+  name: postalcode-spawn-demo
+  annotations:
+    spawn-eigr.io/actor-system: spawn-demo
+    spawn-eigr.io/app-port: "8091"
+    spawn-eigr.io/sidecar-pubsub-nats-hosts: "nats://nats.spawn.svc.cluster.local:4222"
+spec:
+#  selector:
+#    app: postalcode-spawn-demo
+  host:
+    image: image-registry.openshift-image-registry.svc:5000/spawn/postalcode-spawn-demo
+    env:
+      - name: TZ
+        value: 'America/Sao_Paulo'
+      - name: STARTUP_DELAY_SECONDS
+        value: "30"
+      - name: SPAWN_SYSTEM_NAME
+        value: spawn-demo
+    ports:
+      - name: "http"
+        containerPort: 8080
+      - name: "actor"
+        containerPort: 8091

k8s/deployment.yaml

@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nats
+  labels:
+    app: nats
+spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+  revisionHistoryLimit: 5
+  progressDeadlineSeconds: 600
+  selector:
+    matchLabels:
+      app: nats
+  template:
+    metadata:
+      labels:
+        app: nats
+    spec:
+      containers:
+        - name: nats
+          imagePullPolicy: Always
+          image: docker.io/library/nats:2
+          env:
+            - name: TZ
+              value: 'America/Sao_Paulo'
+          ports:
+            - name: "tcp-4222"
+              containerPort: 4222
+              protocol: TCP
+            - name: "tcp-6222"
+              containerPort: 6222
+              protocol: TCP
+            - name: "tcp-8222"
+              containerPort: 8222
+              protocol: TCP
+          resources:
+            requests:
+              cpu: 100m
+              memory: 80Mi

k8s/service.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nats
+  labels:
+    app: nats
+spec:
+  ports:
+    - name: "tcp-4222"
+      protocol: TCP
+      port: 4222
+      targetPort: "tcp-4222"
+    - name: "tcp-8222"
+      protocol: TCP
+      port: 8222
+      targetPort: "tcp-8222"
+    - name: "tcp-6222"
+      protocol: TCP
+      port: 6222
+      targetPort: "tcp-6222"
+  selector:
+    app: nats