Rebased code changes for Compose Refactor #8

environments/dev/apps/refarch-kc/base/kafka/kafka-topics.yaml

@@ -1,15 +1,5 @@
 apiVersion: kafka.strimzi.io/v1beta1
 kind: KafkaTopic
-metadata:
-  name: allocated-orders
-  labels:
-    strimzi.io/cluster: my-cluster
-spec:
-  partitions: 1
-  replicas: 1
----
-apiVersion: kafka.strimzi.io/v1beta1
-kind: KafkaTopic
 metadata:
   name: bluewater-container
   labels:
@@ -108,13 +98,3 @@ spec:
   partitions: 1
   replicas: 1
 ---
-apiVersion: kafka.strimzi.io/v1beta1
-kind: KafkaTopic
-metadata:
-  name: rejected-orders
-  labels:
-    strimzi.io/cluster: my-cluster
-spec:
-  partitions: 1
-  replicas: 1
----

environments/dev/env/base/kafka-topics-configmap.yaml

@@ -3,7 +3,6 @@ kind: ConfigMap
 metadata:
   name: kafka-topics
 data:
-  allocatedOrdersTopic: allocated-orders
   bluewaterContainerTopic: bluewater-container
   bluewaterProblemTopic: bluewater-problem
   bluewaterShipTopic: bluewater-ship
@@ -14,4 +13,3 @@ data:
   orderCommandsTopic: order-commands
   ordersTopic: orders
   reeferTelemetryTopic: reefer-telemetry
-  rejectedOrdersTopic: rejected-orders

environments/dev/services/reefersimulator/base/config/app-deploy.yaml

@@ -33,16 +33,11 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: TELEMETRY_TOPIC
+  - name: MP_MESSAGING_INCOMING_REEFER_TELEMETRY_TOPIC
     valueFrom:
       configMapKeyRef:
         key: reeferTelemetryTopic
         name: kafka-topics
-  - name: CONTAINER_TOPIC
-    valueFrom:
-      configMapKeyRef:
-        key: containersTopic
-        name: kafka-topics
 # TODO: Remove from app-deploy.yaml in refarch-reefer-ml
 #  - name: KAFKA_APIKEY
 #    valueFrom:

environments/dev/services/scoringmp/base/config/deployment.yaml

@@ -68,7 +68,7 @@ spec:
           #############################
           ### Reactive Messaging topics
           #############################
-          - name: MP_MESSAGING_INCOMING_REEFERTELEMETRY_TOPIC
+          - name: MP_MESSAGING_INCOMING_REEFER_TELEMETRY_TOPIC
             valueFrom:
               configMapKeyRef:
                 name: "kafka-topics"

environments/dev/services/voyagesms/base/config/app-deploy.yaml

@@ -49,7 +49,7 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: ORDER_TOPIC
+  - name: KCSOLUTION_ORDERS_TOPIC
     valueFrom:
       configMapKeyRef:
         key: ordersTopic

environments/example-credentials/env/base/kafka-topics-configmap.yaml

@@ -3,7 +3,6 @@ kind: ConfigMap
 metadata:
   name: kafka-topics
 data:
-  allocatedOrdersTopic: eda-integration-allocated-orders
   bluewaterContainerTopic: eda-integration-bluewaterContainer
   bluewaterProblemTopic: eda-integration-bluewaterProblem
   bluewaterShipTopic: eda-integration-bluewaterShip
@@ -14,4 +13,3 @@ data:
   orderCommandsTopic: eda-integration-order-commands
   ordersTopic: eda-integration-orders
   reeferTelemetryTopic: eda-integration-reefer-telemetry
-  rejectedOrdersTopic: eda-integration-rejected-orders

environments/example-credentials/services/reefersimulator/base/config/app-deploy.yaml

@@ -33,16 +33,11 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: TELEMETRY_TOPIC
+  - name: MP_MESSAGING_INCOMING_REEFER_TELEMETRY_TOPIC
     valueFrom:
       configMapKeyRef:
         key: reeferTelemetryTopic
         name: kafka-topics
-  - name: CONTAINER_TOPIC
-    valueFrom:
-      configMapKeyRef:
-        key: containersTopic
-        name: kafka-topics
 # TODO: Remove from app-deploy.yaml in refarch-reefer-ml
 #  - name: KAFKA_APIKEY
 #    valueFrom:

environments/example-credentials/services/voyagesms/base/config/app-deploy.yaml

@@ -49,7 +49,7 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: ORDER_TOPIC
+  - name: KCSOLUTION_ORDERS_TOPIC
     valueFrom:
       configMapKeyRef:
         key: ordersTopic

environments/example-es-truststore/env/base/kafka-topics-configmap.yaml

@@ -3,7 +3,6 @@ kind: ConfigMap
 metadata:
   name: kafka-topics
 data:
-  allocatedOrdersTopic: allocated-orders
   bluewaterContainerTopic: bluewaterContainer
   bluewaterProblemTopic: bluewaterProblem
   bluewaterShipTopic: bluewaterShip
@@ -14,4 +13,3 @@ data:
   orderCommandsTopic: order-commands
   ordersTopic: orders
   reeferTelemetryTopic: reefer-telemetry
-  rejectedOrdersTopic: rejected-orders

environments/example-es-truststore/services/reefersimulator/base/config/app-deploy.yaml

@@ -33,16 +33,11 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: TELEMETRY_TOPIC
+  - name: MP_MESSAGING_INCOMING_REEFER_TELEMETRY_TOPIC
     valueFrom:
       configMapKeyRef:
         key: reeferTelemetryTopic
         name: kafka-topics
-  - name: CONTAINER_TOPIC
-    valueFrom:
-      configMapKeyRef:
-        key: containersTopic
-        name: kafka-topics
 # TODO: Remove from app-deploy.yaml in refarch-reefer-ml
 #  - name: KAFKA_APIKEY
 #    valueFrom:

environments/example-es-truststore/services/scoringmp/base/config/deployment.yaml

@@ -68,7 +68,7 @@ spec:
           #############################
           ### Reactive Messaging topics
           #############################
-          - name: MP_MESSAGING_INCOMING_REEFERTELEMETRY_TOPIC
+          - name: MP_MESSAGING_INCOMING_REEFER_TELEMETRY_TOPIC
             valueFrom:
               configMapKeyRef:
                 name: "kafka-topics"

environments/example-es-truststore/services/voyagesms/base/config/app-deploy.yaml

@@ -49,7 +49,7 @@ spec:
       configMapKeyRef:
         key: brokers
         name: kafka-brokers
-  - name: ORDER_TOPIC
+  - name: KCSOLUTION_ORDERS_TOPIC
     valueFrom:
       configMapKeyRef:
         key: ordersTopic