From 33d16e5299bda0577d6a4a4fe80a53f2b6cb6747 Mon Sep 17 00:00:00 2001 From: 3dwardch3ng Date: Fri, 30 Aug 2024 03:36:37 +0000 Subject: [PATCH 1/2] Update for next development version [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c57dac4..9bd5804 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ ec-config-server - 1.0.2 + 1.0.3-SNAPSHOT From b8c1aa15f7b8138cbc9c99d1950753e0e0023ae9 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Fri, 30 Aug 2024 17:10:31 +1000 Subject: [PATCH 2/2] update application properties --- script/entrypoint.sh | 2 +- .../{application-k3s-cluster.yml => application-k3s.yml} | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename src/main/resources/{application-k3s-cluster.yml => application-k3s.yml} (71%) diff --git a/script/entrypoint.sh b/script/entrypoint.sh index af05428..9601404 100644 --- a/script/entrypoint.sh +++ b/script/entrypoint.sh @@ -3,7 +3,7 @@ if test "${SPRING_PROFILES_ACTIVE}" != ''; then echo "spring active profile is "$SPRING_PROFILES_ACTIVE - JAVA_OPTIONS="$JAVA_OPTIONS -Dspring.profiles.active=cloud,native,$SPRING_PROFILES_ACTIVE" + JAVA_OPTIONS="$JAVA_OPTIONS -Dspring.profiles.active=native,$SPRING_PROFILES_ACTIVE" fi if test "${LOCAL_DOCKER_ENV}" = 'true'; diff --git a/src/main/resources/application-k3s-cluster.yml b/src/main/resources/application-k3s.yml similarity index 71% rename from src/main/resources/application-k3s-cluster.yml rename to src/main/resources/application-k3s.yml index 9390a3c..2538b2a 100644 --- a/src/main/resources/application-k3s-cluster.yml +++ b/src/main/resources/application-k3s.yml @@ -1,7 +1,9 @@ spring: cloud: kubernetes: + enabled: true discovery: + enabled: true all-namespaces: false service-labels: spring-boot: true