Merge branch 'main' into dev

Author: obriensystems

.github/workflows/maven-publish.yml

@@ -6,6 +6,9 @@ name: Maven Package
 on:
   release:
     types: [created]
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
@@ -17,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -29,6 +32,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Publish to GitHub Packages Apache Maven
+      if: github.event_name == 'release'
       run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
       env:
         GITHUB_TOKEN: ${{ github.token }}

.mvn/jvm.config

@@ -1 +1 @@
-#--enable-native-access=ALL-UNNAMED
+

README.md

@@ -5,6 +5,70 @@ Biometric Backend
 
 ## Architecture
 ### Deployment
+#### Helm
+#### Kubernetes
+see https://github.com/ObrienlabsDev/biometric-backend/tree/main/biometric-nbi/src/kubernetes
+```
+kubernetes % ./deploy.sh
+(venv-t214) michaelobrien@mbp8 kubernetes % kubectl get pods -n mysql                                    
+NAME                    READY   STATUS    RESTARTS   AGE
+mysql-9fbfc4867-bj4gz   1/1     Running   0          5m39s
+(venv-t214) michaelobrien@mbp8 kubernetes % kubectl get services -n mysql                                
+NAME    TYPE        CLUSTER-IP   EXTERNAL-IP   PORT(S)    AGE
+mysql   ClusterIP   None         <none>        3306/TCP   31m
+(venv-t214) michaelobrien@mbp8 kubernetes % kubectl exec -it mysql-9fbfc4867-bj4gz -n mysql  -- /bin/bash
+bash-5.1# mysql -p
+
+mysql> CREATE DATABASE IF NOT EXISTS biometric;
+Query OK, 1 row affected (0.01 sec)
+
+mysql> show databases;
++--------------------+
+| Database           |
++--------------------+
+| biometric          |
+| information_schema |
+| mysql              |
+| performance_schema |
+| sys                |
++--------------------+
+6 rows in set (0.00 sec)
+
+mysql> use biometric;
+Database changed
+mysql> exit
+Bye
+bash-5.1# exit
+exit
+(venv-t214) michaelobrien@mbp8 kubernetes % 
+
+```
+
+test outside by port forwarding
+
+```
+(venv-t214) michaelobrien@mbp8 kubernetes % kubectl port-forward mysql-9fbfc4867-bj4gz -n mysql 3306:3306
+Forwarding from 127.0.0.1:3306 -> 3306
+Forwarding from [::1]:3306 -> 3306
+```
+
+If you prefer direct access without port forwarding, update `mysql-service.yaml`
+to use a `NodePort` service. The example in this repository exposes port `3306`
+on node port `30306`:
+
+```
+spec:
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 3306
+      targetPort: 3306
+      nodePort: 30306
+```
+After applying the updated service you can connect using `<node-ip>:30306`.
+
+![Image](https://github.com/user-attachments/assets/943d18d8-2cfc-478e-91ed-a7cd7b1dcf23)
+
 #### Docker Desktop
 - see https://github.com/ObrienlabsDev/biometric-backend/issues/6
 ```

biometric-nbi/src/kubernetes/mysql-secret.yaml

@@ -8,5 +8,5 @@ metadata:
   namespace: mysql
 type: kubernetes.io/basic-auth
 stringData:
-  password: password
+  password: root
 

biometric-nbi/src/kubernetes/mysql-service.yaml

@@ -7,11 +7,12 @@ metadata:
   name: mysql
   namespace: mysql
 spec:
+  type: NodePort
   # kubectl port-forward mysql-58b7767464-dgpf4 3306:3306
   ports:
   - protocol: TCP
     port: 3306
     targetPort: 3306
+    nodePort: 30306
   selector:
     app: mysql
-  clusterIP: None

biometric-nbi/src/main/resources/application.properties

@@ -10,13 +10,17 @@ server.port=8080
 #spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.hibernate.ddl-auto=none
 #spring.jpa.properties.hibernate.globally_quoted_identifiers=true
-spring.datasource.url=jdbc:mysql://192.168.0.105:3506/biometric
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3506/biometric
+#spring.datasource.url=jdbc:mysql://192.168.0.105:3506/biometric
+#spring.datasource.username=root
+#spring.datasource.password=root
+#spring.datasource.url=jdbc:mysql://localhost:3506/biometric
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/biometric
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=password
 # deprecated
 #spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+#spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
 
 # override auto conversion of tsStart to ts_start
 # see https://stackoverflow.com/questions/25283198/spring-boot-jpa-column-name-annotation-ignored