Load configserver only in production and move refreshable prod properties to wahlrecht-prod

module-deploy/k8s/prod/application-prod.yaml

@@ -1,2 +0,0 @@
-server:
-  port: 12000

module-server/src/main/resources/application-prod.yaml

@@ -0,0 +1,5 @@
+spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://configserver:8888/config"

module-server/src/main/resources/application.yaml

@@ -24,7 +24,9 @@ management:
 
 spring:
   config:
-    import: "optional:configserver:http://127.0.0.1:8888/config"
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://configserver:8888/config"
   main:
     banner-mode: off
   profiles:
@@ -41,16 +43,6 @@ spring:
     name: wahlrecht
 
 
-# properties for application
-de.twomartens.wahlrecht:
-  defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s"
-  statusprobe:
-    scheduleDuration: 60
-    maxKafkaFailureDuration: 5
-    maxBlobFailureCount: 5
-    maxFailurePercent: 50
-
 springdoc:
   swagger-ui:
     display-request-duration: true

module-server/src/main/resources/config/wahlrecht-prod.yaml

@@ -0,0 +1,2 @@
+de.twomartens.wahlrecht:
+  greeting: "Moin %s"

module-server/src/main/resources/config/wahlrecht.yaml

@@ -0,0 +1,8 @@
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s"
+  statusprobe:
+    scheduleDuration: 60
+    maxKafkaFailureDuration: 5
+    maxBlobFailureCount: 5
+    maxFailurePercent: 50