Merge pull request #84 from it-at-m/dave-ls2

DAVe LS2

charts/dave/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: dave
 description: DAVe traffic counting plattform
 type: application
-version: 0.0.5
+version: 0.0.6
 appVersion: "v1.0.0"
 maintainers:
   - name: gislab-augsburg

charts/dave/charts/admin-portal/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/it-at-m/dave-admin-portal
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main-ls1"
+  tag: "main-ls2"
 
 imagePullSecrets: []
 # nameOverride: ""

charts/dave/charts/backend/values.yaml

@@ -5,10 +5,10 @@
 replicaCount: 1
 
 image:
-  repository: ghcr.io/it-at-m/dave-backend-postgres
+  repository: ghcr.io/it-at-m/dave-backend
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main-ls1"
+  tag: "main-ls2"
 
 imagePullSecrets: []
 # nameOverride: ""

charts/dave/charts/eai/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/it-at-m/dave-eai
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main-ls1"
+  tag: "main-ls2"
 
 imagePullSecrets: []
 # nameOverride: ""

charts/dave/charts/frontend/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/it-at-m/dave-frontend
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main-ls1"
+  tag: "main-ls2"
 
 imagePullSecrets: []
 # nameOverride: ""

charts/dave/charts/selfservice-portal/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/it-at-m/dave-selfservice-portal
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "main-ls1"
+  tag: "main-ls2"
 
 imagePullSecrets: []
 # nameOverride: ""

charts/dave/values.yaml

@@ -30,8 +30,7 @@ backend:
       HAZELCAST_INSTANCE: dave-backend-service-hazl_instance
       HAZELCAST_OPENSHIFT_SERVICE_NAME: dave-backend-service
       # Java
-      JAVA_OPTIONS: <Java Options>
-      JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8 -Dhz.integritychecker.enabled=false
+      JAVA_OPTS_APPEND: -Dfile.encoding=UTF-8 -Dhz.integritychecker.enabled=false
       # Other
       GC_MAX_METASPACE_SIZE: "256"
       SERVER_PORT: "8080"
@@ -60,6 +59,10 @@ backend:
       SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KEYCLOAK_CLIENT-SECRET: TBD
       SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KEYCLOAK_AUTHORIZATION-GRANT-TYPE: client_credentials
       SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KEYCLOAK_CLIENT-AUTHENTICATION-METHOD: client_secret_post
+      # SPRING_FLYWAY_BASELINE-ON-MIGRATE and SPRING_FLYWAY_BASELINE-VERSION have to be set on initial startup
+      # to create flyway table in database, can be commented out after initial startup.
+      SPRING_FLYWAY_BASELINE-ON-MIGRATE: "true"
+      SPRING_FLYWAY_BASELINE-VERSION: "1"
       REALM: Dave
       KEYCLOAK_AUTH-SERVER-URL: <Auth-Server URL>
       # Elasticsearch
@@ -105,8 +108,7 @@ admin-portal:
     HAZELCAST_INSTANCE: dave-adminportal-apigateway-service-hazl_instance
     HAZELCAST_OPENSHIFT_SERVICE_NAME: dave-adminportal-apigateway-service
     # Java
-    JAVA_OPTIONS: <Java Options>
-    JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8 -Dhz.integritychecker.enabled=false
+    JAVA_OPTS_APPEND: -Dfile.encoding=UTF-8 -Dhz.integritychecker.enabled=false
     # Other
     SERVER_PORT: "8080"
     # Spring, Keycloak
@@ -151,8 +153,7 @@ eai:
   # Environment variables
   extraEnvVars:
     # Java
-    JAVA_OPTIONS: <Java Options>
-    JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+    JAVA_OPTS_APPEND: -Dfile.encoding=UTF-8
     # Other
     GC_MAX_METASPACE_SIZE: "256"
     BACKEND_URI: dave-backend-service:8080
@@ -175,8 +176,7 @@ frontend:
     HAZELCAST_INSTANCE: dave-frontend-apigateway-service-hazl_instance
     HAZELCAST_OPENSHIFT_SERVICE_NAME: dave-frontend-apigateway-service
     # Java
-    JAVA_OPTIONS: <Java Options>
-    JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+    JAVA_OPTS_APPEND: -Dfile.encoding=UTF-8
     # Other
     SERVER_PORT: "8080"
     # Spring, Keycloak
@@ -229,8 +229,7 @@ selfservice-portal:
     HAZELCAST_INSTANCE: dave-selfserviceportal-apigateway-service-hazl_instance
     HAZELCAST_OPENSHIFT_SERVICE_NAME: dave-selfserviceportal-apigateway-service
     # Java
-    JAVA_OPTIONS: <Java Options>
-    JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+    JAVA_OPTS_APPEND: -Dfile.encoding=UTF-8
     # Other
     SERVER_PORT: "8080"
     # Spring, Keycloak