Edit Helm Notes, bump Camel to 3.7

components/datagrid-rest-service/pom.xml

@@ -6,9 +6,9 @@
   <artifactId>datagrid-rest-service</artifactId>
   <version>1.0.0-SNAPSHOT</version>
 	<properties>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
-    <camel.version>3.0.1</camel.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <camel.version>3.7.0</camel.version>
   </properties>
 	<dependencies>
 		<dependency>

components/kafka-streaming-service/pom.xml

@@ -6,9 +6,9 @@
   <artifactId>kafka-streaming-service</artifactId>
   <version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<maven.compiler.source>12</maven.compiler.source>
-		<maven.compiler.target>12</maven.compiler.target>
-		<camel.version>3.2.0</camel.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<camel.version>3.7.0</camel.version>
 	</properties>
 	<dependencies>
 		<dependency>

components/kafka-streaming-service/src/main/java/com/redhat/bobbycar/routes/KafkaSseRoute.java

@@ -10,21 +10,21 @@ public void configure() throws Exception {
 		from("kafka:{{com.redhat.bobbycar.camelk.kafka.topic.gps}}?clientId=kafkaSseCamelClient&brokers={{com.redhat.bobbycar.camelk.kafka.brokers}}")
 			.log("GPS position received from Kafka : ${body}")
 			.to("undertow:ws://0.0.0.0:8080/api/carevents?sendToAll=true");
-		from("undertow:ws://0.0.0.0:8080/api/carevents?sendToAll=true")
+		from("undertow:ws://0.0.0.0:8080/api/carevents")
 			.log("Message received from Websocket : ${body}");
 
 		// expose Bobbycar engine metrics from Kafka as Websocket
 		from("kafka:{{com.redhat.bobbycar.camelk.kafka.topic.metrics}}?clientId=kafkaSseMetricsClient&brokers={{com.redhat.bobbycar.camelk.kafka.brokers}}")
 			.log("Metric received from Kafka : ${body}")
 			.to("undertow:ws://0.0.0.0:8080/api/carmetrics?sendToAll=true");
-		from("undertow:ws://0.0.0.0:8080/api/carmetrics?sendToAll=true")
+		from("undertow:ws://0.0.0.0:8080/api/carmetrics")
 			.log("Message received from Websocket : ${body}");
 
 		// expose Bobbycar zone change events from Kafka as Websocket
 		from("kafka:{{com.redhat.bobbycar.camelk.kafka.topic.zonechange}}?clientId=kafkaSseZoneChangeClient&brokers={{com.redhat.bobbycar.camelk.kafka.brokers}}")
 				.log("Zone change event received from Kafka : ${body}")
 				.to("undertow:ws://0.0.0.0:8080/api/zonechange?sendToAll=true");
-		from("undertow:ws://0.0.0.0:8080/api/zonechange?sendToAll=true&")
+		from("undertow:ws://0.0.0.0:8080/api/zonechange")
 				.log("Message received from Websocket : ${body}");
 
 	}

components/kafka2datagrid-service/pom.xml

@@ -8,7 +8,7 @@
 	<properties>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-		<camel.version>3.1.0</camel.version>
+		<camel.version>3.7.0</camel.version>
 	</properties>
 	<dependencies>
 		<dependency>

components/kafka2s3-service/pom.xml

@@ -6,9 +6,9 @@
 	<artifactId>kafka2S3-service</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
-		<camel.version>3.4.0</camel.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<camel.version>3.7.0</camel.version>
 	</properties>
 	<dependencies>
 		<dependency>

components/mqtt2kafka-service/pom.xml

@@ -6,9 +6,9 @@
   <artifactId>mqtt2kafka-service</artifactId>
   <version>1.0.0-SNAPSHOT</version>
 	<properties>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
-    <camel.version>3.0.1</camel.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <camel.version>3.7.0</camel.version>
   </properties>
 	<dependencies>
 		<dependency>

helm/README.md

@@ -35,41 +35,58 @@ oc apply -f operator-group.yaml
 
 ### 4. Install the *bobbycar-core-infra* Helm chart
 
-Edit the chart values.yaml and install the chart
 
-**Adjusting these fields to your environement is mandatory:**
+Either edit the chart values.yaml or override the values with the commandline flags to install the chart.
+
+**Adjusting these values to your environment is mandatory:**
 - ocpDomain
 - namespace
 
 You can leave the others as default values if you like.
 
-
-``` sh
+Option 1:
+```sh
+helm install bobbycar-core-infra bobbycar-core-infra/ --set-string ocpDomain=apps.ocp4.stormshift.coe.muc.redhat.com --set-string namespace=bobbycar
+```
+Option 2:
+```sh
 vi bobbycar-core-infra/values.yaml
 
-helm install bobbycar-core-infra/ -g
+helm install bobbycar-core-infra bobbycar-core-infra/
 ```
 
 Wait for around 2 minutes and verify that all components have been successfully installed.
 
 ### 5. Install *bobbycar-core-apps* chart
 
-Edit the chart values.yaml and install the chart.
+Either edit the chart values.yaml or override the values with the commandline flags to install the chart.
 
-**Adjusting these fields to your environement is mandatory:**
+**Adjusting these values to your environment is mandatory:**
 - ocpDomain
 - ocpApi  
 - namespace
 - datagrid.account.password
 - dashboard.config.googleApiKey
 
-Get the datagrid password from the **bobbycar-dg-generated-secret** secret.
+**Get the datagrid operator password from the bobbycar-dg-generated-secret secret.**
 
 You can leave the others as default values if you like.
+
+Option 1:
+```sh
+helm install bobbycar-core-apps bobbycar-core-apps/ \
+--set-string ocpDomain=apps.ocp4.stormshift.coe.muc.redhat.com \
+--set-string ocpApi=api.ocp4.stormshift.coe.muc.redhat.com \
+--set-string namespace=bobbycar \
+--set-string datagrid.account.password=YourPassword \
+--set-string dashboard.config.googleApiKey=YourGoogleApiKey
+```
+
+Option 2:
 ```sh
 vi bobbycar-core-apps/values.yaml
 
-helm install bobbycar-core-apps/ -g
+helm install bobbycar-core-apps bobbycar-core-apps/
 ```
 Verify that all components have been successfully installed.
 

helm/bobbycar-core-apps/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/bobbycar-core-apps/templates/NOTES.txt

@@ -1 +1,10 @@
-Bobbycar core application components
+Bobbycar core application components:
+
+- Bobbycar vehicle simulator: Quarkus app
+- Dashboard: Angular/Ionic app
+- BobbycarZone CRD
+- 3 BobbycarZone CRs
+- Cache Service: Camel-K app
+- Dashboard Streaming Service: Camel-K app
+- Kafka2Datagrid Service: Camel-K app
+- MQTT2Kafka Service: Camel-K app

helm/bobbycar-core-infra/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/bobbycar-core-infra/templates/NOTES.txt

@@ -1,13 +1,11 @@
-Bobbycar core infrastructure components
+Bobbycar core infrastructure components:
 
 - AMQ Broker Operator Subscription
 - AMQ Broker CR
-
 - Camel-K Operator Subscription
-
 - Datagrid Operator Subscription
 - Datagrid CR and Route
-
 - AMQ Streams Operator Subscription
 - AMQ Streams Kafka Cluster
-- AMQ Streams Kafka HTTP Bridge Cluster and Route
+- AMQ Streams Kafka HTTP Bridge Cluster and Route
+- 3 Kafka Topics