From 1e76fd5b29b715fb44b2e97553be56de6a9a8a45 Mon Sep 17 00:00:00 2001 From: Ortwin Schneider Date: Fri, 22 Jan 2021 13:30:29 +0100 Subject: [PATCH] Edit Helm Notes, bump Camel to 3.7 --- components/datagrid-rest-service/pom.xml | 6 ++-- components/kafka-streaming-service/pom.xml | 6 ++-- .../redhat/bobbycar/routes/KafkaSseRoute.java | 6 ++-- components/kafka2datagrid-service/pom.xml | 2 +- components/kafka2s3-service/pom.xml | 6 ++-- components/mqtt2kafka-service/pom.xml | 6 ++-- helm/README.md | 35 ++++++++++++++----- helm/bobbycar-core-apps/Chart.yaml | 2 +- helm/bobbycar-core-apps/templates/NOTES.txt | 11 +++++- helm/bobbycar-core-infra/Chart.yaml | 2 +- helm/bobbycar-core-infra/templates/NOTES.txt | 8 ++--- 11 files changed, 57 insertions(+), 33 deletions(-) diff --git a/components/datagrid-rest-service/pom.xml b/components/datagrid-rest-service/pom.xml index a8f4b1b..62168dd 100644 --- a/components/datagrid-rest-service/pom.xml +++ b/components/datagrid-rest-service/pom.xml @@ -6,9 +6,9 @@ datagrid-rest-service 1.0.0-SNAPSHOT - 8 - 8 - 3.0.1 + 11 + 11 + 3.7.0 diff --git a/components/kafka-streaming-service/pom.xml b/components/kafka-streaming-service/pom.xml index 446b37b..e3d425d 100644 --- a/components/kafka-streaming-service/pom.xml +++ b/components/kafka-streaming-service/pom.xml @@ -6,9 +6,9 @@ kafka-streaming-service 1.0.0-SNAPSHOT - 12 - 12 - 3.2.0 + 11 + 11 + 3.7.0 diff --git a/components/kafka-streaming-service/src/main/java/com/redhat/bobbycar/routes/KafkaSseRoute.java b/components/kafka-streaming-service/src/main/java/com/redhat/bobbycar/routes/KafkaSseRoute.java index 1c5a9cc..795c97f 100644 --- a/components/kafka-streaming-service/src/main/java/com/redhat/bobbycar/routes/KafkaSseRoute.java +++ b/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}"); } diff --git a/components/kafka2datagrid-service/pom.xml b/components/kafka2datagrid-service/pom.xml index 038cb54..a331b22 100644 --- a/components/kafka2datagrid-service/pom.xml +++ b/components/kafka2datagrid-service/pom.xml @@ -8,7 +8,7 @@ 11 11 - 3.1.0 + 3.7.0 diff --git a/components/kafka2s3-service/pom.xml b/components/kafka2s3-service/pom.xml index b539744..18cf03a 100644 --- a/components/kafka2s3-service/pom.xml +++ b/components/kafka2s3-service/pom.xml @@ -6,9 +6,9 @@ kafka2S3-service 1.0.0-SNAPSHOT - 8 - 8 - 3.4.0 + 11 + 11 + 3.7.0 diff --git a/components/mqtt2kafka-service/pom.xml b/components/mqtt2kafka-service/pom.xml index 48c8e17..952b43e 100644 --- a/components/mqtt2kafka-service/pom.xml +++ b/components/mqtt2kafka-service/pom.xml @@ -6,9 +6,9 @@ mqtt2kafka-service 1.0.0-SNAPSHOT - 8 - 8 - 3.0.1 + 11 + 11 + 3.7.0 diff --git a/helm/README.md b/helm/README.md index 05aeb4a..1b83118 100644 --- a/helm/README.md +++ b/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. diff --git a/helm/bobbycar-core-apps/Chart.yaml b/helm/bobbycar-core-apps/Chart.yaml index 1b069e3..b51c12a 100644 --- a/helm/bobbycar-core-apps/Chart.yaml +++ b/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 diff --git a/helm/bobbycar-core-apps/templates/NOTES.txt b/helm/bobbycar-core-apps/templates/NOTES.txt index db75d7d..344e449 100644 --- a/helm/bobbycar-core-apps/templates/NOTES.txt +++ b/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 diff --git a/helm/bobbycar-core-infra/Chart.yaml b/helm/bobbycar-core-infra/Chart.yaml index d147a67..c6d7f82 100644 --- a/helm/bobbycar-core-infra/Chart.yaml +++ b/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 diff --git a/helm/bobbycar-core-infra/templates/NOTES.txt b/helm/bobbycar-core-infra/templates/NOTES.txt index 8526122..bf1c0b4 100644 --- a/helm/bobbycar-core-infra/templates/NOTES.txt +++ b/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 \ No newline at end of file +- AMQ Streams Kafka HTTP Bridge Cluster and Route +- 3 Kafka Topics \ No newline at end of file