This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 086ccd3 Improve master example on OCP
086ccd3 is described below
commit 086ccd38b14c77efea0b9b9e1e6622bc416d6504
Author: Marco Carletti <[email protected]>
AuthorDate: Tue Sep 5 11:51:03 2023 +0200
Improve master example on OCP
---
master/pom.xml | 12 ++++++++----
master/src/main/resources/application-file.properties | 11 +++++++++++
master/src/main/resources/application-openshift.properties | 3 +++
master/src/main/resources/application.properties | 11 +----------
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/master/pom.xml b/master/pom.xml
index 2612b91..0af3e23 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -61,10 +61,6 @@
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
@@ -123,6 +119,14 @@
</property>
</activation>
<dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-kubernetes-starter</artifactId>
diff --git a/master/src/main/resources/application-file.properties
b/master/src/main/resources/application-file.properties
index 780d36c..04df99c 100644
--- a/master/src/main/resources/application-file.properties
+++ b/master/src/main/resources/application-file.properties
@@ -18,3 +18,14 @@
camel.cluster.file.enabled = true
camel.cluster.file.id = ${node.id}
camel.cluster.file.root = ${java.io.tmpdir}
+
+management.endpoints.enabled-by-default = false
+management.endpoints.jmx.enabled = false
+management.endpoint.health.enabled = true
+
+camel.springboot.jmx-enabled = false
+
+management.server.port = -1
+
+node.id = ${random.uuid}
+node.namespace = camel-master
diff --git a/master/src/main/resources/application-openshift.properties
b/master/src/main/resources/application-openshift.properties
index 5e23479..f6870ad 100644
--- a/master/src/main/resources/application-openshift.properties
+++ b/master/src/main/resources/application-openshift.properties
@@ -17,3 +17,6 @@
camel.cluster.kubernetes.enabled = true
+
+node.id = ${HOSTNAME}
+node.namespace = ${KUBERNETES_NAMESPACE}
diff --git a/master/src/main/resources/application.properties
b/master/src/main/resources/application.properties
index c7a3aaf..6c06380 100644
--- a/master/src/main/resources/application.properties
+++ b/master/src/main/resources/application.properties
@@ -27,15 +27,6 @@ logging.level.org.apache.camel.component.atomix = DEBUG
logging.level.org.apache.camel.component.master = DEBUG
logging.level.org.apache.camel.examples.cluster = DEBUG
-management.endpoints.enabled-by-default = false
-management.endpoints.jmx.enabled = false
-management.endpoint.health.enabled = true
-
-management.server.port = -1
-
-node.id = ${random.uuid}
-node.namespace = camel-master
-
camel.springboot.name = SampleClusteredRouteController
camel.springboot.main-run-controller = true
-camel.springboot.jmx-enabled = false
+
