build($Eureka): simplify Eureka configuration

The difference between each every one of environments is the 'eureka.client.serviceUrl.defaultZone' instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port} status-page-url-path: / BREAKING CHANGE: redefine 'instance-id'
johnnymillergh · May 15, 2020 · b74c761 · b74c761
1 parent 741261e
commit b74c761
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 90 deletions.
diff --git a/api-portal/src/main/resources/application-development-docker.yml b/api-portal/src/main/resources/application-development-docker.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
 

diff --git a/api-portal/src/main/resources/application-development-local.yml b/api-portal/src/main/resources/application-development-local.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
 

diff --git a/api-portal/src/main/resources/application.yml b/api-portal/src/main/resources/application.yml
@@ -31,6 +31,19 @@ spring:
       # The default is 0. We set it as 0 too.
       file-size-threshold: 0
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 feign:
   client:
     config:

diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
 

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
 

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -31,6 +31,19 @@ spring:
       # The default is 0. We set it as 0 too.
       file-size-threshold: 0
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 feign:
   client:
     config:

diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/exercise-mis/src/main/resources/application-development-docker.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
 

diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/exercise-mis/src/main/resources/application-development-local.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
 

diff --git a/exercise-mis/src/main/resources/application.yml b/exercise-mis/src/main/resources/application.yml
@@ -31,6 +31,19 @@ spring:
       # The default is 0. We set it as 0 too.
       file-size-threshold: 0
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 feign:
   client:
     config:

diff --git a/gateway/src/main/resources/application-development-docker.yml b/gateway/src/main/resources/application-development-docker.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
 

diff --git a/gateway/src/main/resources/application-development-local.yml b/gateway/src/main/resources/application-development-local.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
 

diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
@@ -22,6 +22,19 @@ spring:
           enabled: true
           lower-case-service-id: true
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 management:
   endpoints:
     web:

diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
 

diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml
@@ -1,12 +1,5 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
 

diff --git a/muscle-mis/src/main/resources/application.yml b/muscle-mis/src/main/resources/application.yml
@@ -19,6 +19,19 @@ spring:
     sampler:
       probability: 1.0
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 feign:
   client:
     config:

diff --git a/service-registry/src/main/resources/application-development-docker.yml b/service-registry/src/main/resources/application-development-docker.yml
@@ -1,6 +1,4 @@
 eureka:
-  instance:
-    prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://172.16.1.20:${server.port}/eureka/
+      defaultZone: http://${spring.cloud.client.ip-address}:${server.port}/eureka/
diff --git a/service-registry/src/main/resources/application-development-local.yml b/service-registry/src/main/resources/application-development-local.yml
@@ -1,6 +1,4 @@
 eureka:
-  instance:
-    hostname: localhost
   client:
     service-url:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://localhost:${server.port}/eureka/
diff --git a/service-registry/src/main/resources/application.yml b/service-registry/src/main/resources/application.yml
@@ -17,6 +17,8 @@ spring:
     time-zone: GMT+8
 
 eureka:
+  instance:
+    prefer-ip-address: true
   client:
     register-with-eureka: false
     fetch-registry: false

diff --git a/spring-boot-admin/src/main/resources/application-development-docker.yml b/spring-boot-admin/src/main/resources/application-development-docker.yml
@@ -1,11 +1,4 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://172.16.1.20:8760/eureka/
diff --git a/spring-boot-admin/src/main/resources/application-development-local.yml b/spring-boot-admin/src/main/resources/application-development-local.yml
@@ -1,11 +1,4 @@
 eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    metadata-map:
-      # needed to trigger info and endpoint update after restart
-      startup: ${random.int}
   client:
-    registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://localhost:8760/eureka/
diff --git a/spring-boot-admin/src/main/resources/application.yml b/spring-boot-admin/src/main/resources/application.yml
@@ -16,6 +16,19 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /
+    metadata-map:
+      # needed to trigger info and endpoint update after restart
+      startup: ${random.int}
+    instance-id: ${spring.cloud.client.hostname}:${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    registryFetchIntervalSeconds: 5
+
 management:
   endpoints:
     web: