🎨 Refactored to use Red Hat AMQ Streams Operators

Author: rmarting

01-source-cluster/01-amq-streams-operator/README.md

@@ -0,0 +1,27 @@
+# Red Hat AMQ Streams Operator
+
+To deploy the Red Hat AMQ Streams Operators we need to use an user with ```cluster-admin``` role.
+
+```shell
+oc login -u admin-user
+```
+
+Deploy the Red Hat AMQ Streams Operators with a Subscription from the Operator Hub:
+
+```shell
+❯ oc apply -f amq-streams-migration-og.yml
+❯ oc apply -f amq-streams-migration-subscription.yml
+```
+
+**NOTE**: This is a *namespaced* installation of the operator.
+
+You could check the status of the subscription with the following commands:
+
+```shell
+❯ oc get csv
+NAME                DISPLAY                             VERSION   REPLACES   PHASE
+amqstreams.v1.6.3   Red Hat Integration - AMQ Streams   1.6.3                Succeeded
+```
+
+[Adding Operators to a cluster](https://docs.openshift.com/container-platform/4.5/operators/olm-adding-operators-to-cluster.html) article
+describes deeply how to install Operators using OperatorHub

02-target-cluster/01-strimzi-operator/strimzi-migration-og.yml 01-source-cluster/01-amq-streams-operator/amq-streams-migration-og.yml

@@ -2,8 +2,8 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: strimzi-migration-og
-  namespace: strimzi-migration
+  name: amq-streams-migration-og
+  namespace: amq-streams-migration
 spec:
   targetNamespaces:
-  - strimzi-migration
+  - amq-streams-migration

02-target-cluster/01-strimzi-operator/strimzi-subscription.yml 01-source-cluster/01-amq-streams-operator/amq-streams-migration-subscription.yml

@@ -2,12 +2,12 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: strimzi-kafka-operator
-  namespace: strimzi-migration
+  name: amq-streams
+  namespace: amq-streams-migration
 spec:
   channel: stable
   installPlanApproval: Automatic
-  name: strimzi-kafka-operator
-  source: community-operators
+  name: amq-streams
+  source: redhat-operators
   sourceNamespace: openshift-marketplace
-  startingCSV: strimzi-cluster-operator.v0.26.0
+  startingCSV: amqstreams.v1.6.3

01-source-cluster/01-strimzi-operator/README.md

@@ -39,8 +39,8 @@ We could check the status of this Apache Kafka cluster with:
 
 ```shell
 ❯ oc get kafka
-NAME        DESIRED KAFKA REPLICAS   DESIRED ZK REPLICAS
-event-bus   4                        3                             
+NAME        DESIRED KAFKA REPLICAS   DESIRED ZK REPLICAS   READY   WARNINGS
+event-bus   3                        3                             
 ```
 
 To describe the Kafka:
@@ -53,16 +53,16 @@ The following pods will be deployed:
 
 ```shell
 ❯ oc get pod
-NAME                                                   READY   STATUS    RESTARTS   AGE
-amq-streams-cluster-operator-v1.6.3-58bb6478b9-mh8g9   1/1     Running   0          163m
-event-bus-entity-operator-6dd8bd497c-lv9xn             3/3     Running   0          159m
-event-bus-kafka-0                                      1/1     Running   0          160m
-event-bus-kafka-1                                      1/1     Running   0          160m
-event-bus-kafka-2                                      1/1     Running   0          160m
-event-bus-kafka-exporter-8458898bf-2vspb               1/1     Running   0          158m
-event-bus-zookeeper-0                                  1/1     Running   0          162m
-event-bus-zookeeper-1                                  1/1     Running   0          162m
-event-bus-zookeeper-2                                  1/1     Running   0          162m
+NAME                                                READY   STATUS    RESTARTS   AGE
+event-bus-entity-operator-5b67db696c-msc9w          3/3     Running   0          54s
+event-bus-kafka-0                                   1/1     Running   0          2m36s
+event-bus-kafka-1                                   1/1     Running   0          2m36s
+event-bus-kafka-2                                   1/1     Running   0          2m36s
+event-bus-kafka-exporter-849bfcc8f5-cr89b           1/1     Running   0          13s
+event-bus-zookeeper-0                               1/1     Running   0          4m34s
+event-bus-zookeeper-1                               1/1     Running   0          4m34s
+event-bus-zookeeper-2                               1/1     Running   0          4m34s
+amq-streams-cluster-operator-v1.6.3-58bb479-mh8g9   1/1     Running   0          6m27s
 ```
 
 References:

01-source-cluster/01-strimzi-operator/strimzi-subscription.yml

@@ -17,11 +17,11 @@ This command will show the status of the Kafka Topics:
 
 ```shell
 ❯ oc get kt
-NAME                               CLUSTER     PARTITIONS   REPLICATION FACTOR
-apps.samples.greetings             event-bus   3            3
-apps.samples.greetings.reversed    event-bus   3            3
-monitor.ocp.logs                   event-bus   10           3
-monitor.ocp.metrics                event-bus   10           3
+NAME                              CLUSTER     PARTITIONS   REPLICATION FACTOR   READY
+apps.samples.greetings            event-bus   3            3                    True
+apps.samples.greetings.reversed   event-bus   3            3                    True
+monitor.ocp.logs                  event-bus   10           3                    True
+monitor.ocp.metrics               event-bus   10           3                    True
 ```
 
 To describe a KafkaTopic:

01-source-cluster/02-kafka/README.md

@@ -22,7 +22,7 @@ cluster. Definition [here](./users/admin-user-tls.yml).
 * **migration-user-tls**: Super-user (using TLS authentication) to migrate data of the Kafka
 cluster. Definition [here](./users/migration-user-tls.yml).
 * **sample-user-scram**: User (using scram-sha-512 authentication) to produce and consume records
-into ```apps.samples.greetings``` topic. Definition [here](./users/sample-user-scream.yml).
+into ```apps.samples.greetings``` topic. Definition [here](./users/sample-user-scram.yml).
 * **sample-user-tls**: User (using TLS authentication) to produce and consume records
 from ```apps.samples.greetings``` topic. Definition [here](./users/sample-user-tls.yml).
 * **sample-streams-user-tls**: User to produce and consume records to and from ```app.samples.greetings.*``` topics.
@@ -38,13 +38,13 @@ This command will show the status of the Kafka Users:
 
 ```shell
 ❯ oc get kafkausers
-NAME                      CLUSTER     AUTHENTICATION   AUTHORIZATION
-admin-user-scram          event-bus   scram-sha-512    
-admin-user-tls            event-bus   tls              
-migration-user-tls        event-bus   tls              
-sample-streams-user-tls   event-bus   tls              simple
-sample-user-scram         event-bus   scram-sha-512    simple
-sample-user-tls           event-bus   tls              simple
+NAME                      CLUSTER     AUTHENTICATION   AUTHORIZATION   READY
+admin-user-scram          event-bus   scram-sha-512                    True
+admin-user-tls            event-bus   tls                              True
+migration-user-tls        event-bus   tls                              True
+sample-streams-user-tls   event-bus   tls              simple          True
+sample-user-scram         event-bus   scram-sha-512    simple          True
+sample-user-tls           event-bus   tls              simple          True
 ```
 
 To describe a Kafka User:
@@ -78,32 +78,32 @@ To decrypt the password:
 
 ```shell
 ❯ oc get secret sample-user-scram -o jsonpath='{.data.password}' | base64 -d
-PIPgj8f11S98
+JVDq4gwNjIeU
 ```
 
 These users could be tested with the following sample:
 
 * Sample consumer authenticated with the ```sample-user-scram``` user:
 
 ```shell
-oc run kafka-consumer -n amq-streams-reg1-workshop -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
+oc run kafka-consumer -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=PIPgj8f11S98;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=JVDq4gwNjIeU;
 EOF
-bin/kafka-console-consumer.sh --bootstrap-server event-bus-reg1-kafka-bootstrap:9092 --topic apps.samples.greetings --consumer.config=/tmp/consumer.properties --group sample-group
+bin/kafka-console-consumer.sh --bootstrap-server event-bus-kafka-bootstrap:9092 --topic apps.samples.greetings --consumer.config=/tmp/consumer.properties --group sample-group
 "
 ```
 
 * Sample producer authenticated with the ```sample-user-scram``` user:
 
 ```shell
-oc run kafka-producer -n amq-streams-reg1-workshop -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
+oc run kafka-producer -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=PIPgj8f11S98;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=JVDq4gwNjIeU;
 EOF
-bin/kafka-console-producer.sh --broker-list event-bus-reg1-kafka-bootstrap:9092 --topic apps.samples.greetings --producer.config=/tmp/producer.properties
+bin/kafka-console-producer.sh --broker-list event-bus-kafka-bootstrap:9092 --topic apps.samples.greetings --producer.config=/tmp/producer.properties
 "
 ```
 

01-source-cluster/03-kafka-topics/README.md

@@ -12,10 +12,10 @@ Sample command for producer testing in ```monitor.ocp.metrics``` topic:
 
 ```shell
 oc run kafka-producer-perf-test-metrics -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
-bootstrap.servers=event-bus-reg1-kafka-bootstrap:9092
+bootstrap.servers=event-bus-kafka-bootstrap:9092
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=iJTYvtlqYamz;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=YZlv9tXGjYhF;
 EOF
 bin/kafka-producer-perf-test.sh --topic monitor.ocp.metrics --num-records 1000000 --throughput 5000 --record-size 2048 --print-metrics --producer.config=/tmp/producer.properties
 "
@@ -25,10 +25,10 @@ Sample command for producer testing in ```monitor.ocp.logs``` topic:
 
 ```shell
 oc run kafka-producer-perf-test-logs -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
-bootstrap.servers=event-bus-reg1-kafka-bootstrap:9092
+bootstrap.servers=event-bus-kafka-bootstrap:9092
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=iJTYvtlqYamz;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=YZlv9tXGjYhF;
 EOF
 bin/kafka-producer-perf-test.sh --topic monitor.ocp.logs --num-records 1000000 --throughput 5000 --record-size 2048 --print-metrics --producer.config=/tmp/producer.properties
 "
@@ -51,9 +51,9 @@ Sample command for consumer test in ```monitor.ocp.metrics``` topic:
 oc run kafka-consumer-perf-test-metrics -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=LoDH5nqe3hRw;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=YZlv9tXGjYhF;
 EOF
-bin/kafka-consumer-perf-test.sh --broker-list event-bus-reg1-kafka-bootstrap:9092 --topic monitor.ocp.metrics --consumer.config=/tmp/consumer.properties --group monitor-group --from-latest --messages 1000000 --reporting-interval 1000 --show-detailed-stats
+bin/kafka-consumer-perf-test.sh --broker-list event-bus-kafka-bootstrap:9092 --topic monitor.ocp.metrics --consumer.config=/tmp/consumer.properties --group monitor-group --from-latest --messages 1000000 --reporting-interval 1000 --show-detailed-stats
 "
 ```
 
@@ -63,9 +63,9 @@ Sample command for consumer test in ```monitor.ocp.logs``` topic:
 oc run kafka-consumer-perf-test-logs -ti --image=registry.redhat.io/amq7/amq-streams-kafka-25-rhel7:1.5.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=LoDH5nqe3hRw;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=YZlv9tXGjYhF;
 EOF
-bin/kafka-consumer-perf-test.sh --broker-list event-bus-reg1-kafka-bootstrap:9092 --topic monitor.ocp.logs --consumer.config=/tmp/consumer.properties --group monitor-group --from-latest --messages 1000000 --reporting-interval 1000 --show-detailed-stats
+bin/kafka-consumer-perf-test.sh --broker-list event-bus-kafka-bootstrap:9092 --topic monitor.ocp.logs --consumer.config=/tmp/consumer.properties --group monitor-group --from-latest --messages 1000000 --reporting-interval 1000 --show-detailed-stats
 "
 ```
 
@@ -92,12 +92,15 @@ This application generates `Hello World` messages into ```apps.samples.greetings
 oc apply -f 01-deployment-producer.yml
 ```
 
-A sample log of this application (oc logs -f hello-world-producer-777b876976-hh5cf):
+A sample log of this application:
 
 ```log
-2020-06-26 10:44:57 INFO  KafkaProducerExample:35 - Sending messages "Hello world - 1040"
-2020-06-26 10:44:58 INFO  KafkaProducerExample:35 - Sending messages "Hello world - 1041"
-2020-06-26 10:44:59 INFO  KafkaProducerExample:35 - Sending messages "Hello world - 1042"
+❯ oc logs -f hello-world-producer-777b876976-hh5cf
+...
+2021-11-19 10:44:10 INFO  KafkaProducerExample:69 - Sending messages "Hello world - 359"
+2021-11-19 10:44:10 INFO  KafkaProducerExample:69 - Sending messages "Hello world - 360"
+2021-11-19 10:44:11 INFO  KafkaProducerExample:69 - Sending messages "Hello world - 361"
+...
 ```
 
 ### Streaming Application
@@ -114,9 +117,12 @@ oc apply -f 02-deployment-streams.yml
 A sample log of this application:
 
 ```log
+❯ oc logs -f hello-world-streams-788d49c5c-mfq42
+...
 21729 [sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1] WARN org.apache.kafka.clients.consumer.internals.ConsumerCoordinator - [Consumer clientId=sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1-consumer, groupId=sample-streams-group] Offset commit failed on partition apps.samples.greetings-0 at offset 102: This is not the correct coordinator.
 21729 [sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1] INFO org.apache.kafka.clients.consumer.internals.AbstractCoordinator - [Consumer clientId=sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1-consumer, groupId=sample-streams-group] Group coordinator event-bus-kafka-1.event-bus-kafka-brokers.amq-streams-demo.svc:9093 (id: 2147483646 rack: null) is unavailable or invalid, will attempt rediscovery
 21830 [sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1] INFO org.apache.kafka.clients.consumer.internals.AbstractCoordinator - [Consumer clientId=sample-streams-group-d7cc0a0a-184e-489e-a23e-c33919e59341-StreamThread-1-consumer, groupId=sample-streams-group] Discovered group coordinator event-bus-kafka-0.event-bus-kafka-brokers.amq-streams-demo.svc:9093 (id: 2147483647 rack: null)
+...
 ```
 
 ### Consumer Application
@@ -132,16 +138,21 @@ oc apply -f 03-deployment-consumer.yml
 A sample log of this application:
 
 ```log
-2020-06-26 10:54:45 INFO  KafkaConsumerExample:43 - Received message:
-2020-06-26 10:54:45 INFO  KafkaConsumerExample:44 - 	partition: 1
-2020-06-26 10:54:45 INFO  KafkaConsumerExample:45 - 	offset: 597
-2020-06-26 10:54:45 INFO  KafkaConsumerExample:46 - 	value: "549 - dlrow olleH"
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:43 - Received message:
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:44 - 	partition: 0
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:45 - 	offset: 913
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:46 - 	value: "649 - dlrow olleH"
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:43 - Received message:
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:44 - 	partition: 1
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:45 - 	offset: 598
-2020-06-26 10:54:46 INFO  KafkaConsumerExample:46 - 	value: "749 - dlrow olleH"
+❯ oc logs -f hello-world-consumer-54bb9d7775-6dwbw
+...
+2021-11-19 10:43:40 INFO  KafkaConsumerExample:47 - Received message:
+2021-11-19 10:43:40 INFO  KafkaConsumerExample:48 - 	partition: 1
+2021-11-19 10:43:40 INFO  KafkaConsumerExample:49 - 	offset: 65
+2021-11-19 10:43:40 INFO  KafkaConsumerExample:50 - 	value: "003 - dlrow olleH"
+2021-11-19 10:43:40 INFO  KafkaConsumerExample:52 - 	headers: 
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:47 - Received message:
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:48 - 	partition: 2
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:49 - 	offset: 171
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:50 - 	value: "103 - dlrow olleH"
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:52 - 	headers: 
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:47 - Received message:
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:48 - 	partition: 0
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:49 - 	offset: 70
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:50 - 	value: "203 - dlrow olleH"
+2021-11-19 10:43:41 INFO  KafkaConsumerExample:52 - 	headers: 
 ```

01-source-cluster/04-kafka-users/README.md

@@ -0,0 +1,27 @@
+# Red Hat AMQ Streams Operator
+
+To deploy the Red Hat AMQ Streams Operators we need to use an user with ```cluster-admin``` role.
+
+```shell
+oc login -u admin-user
+```
+
+Deploy the Red Hat AMQ Streams Operators with a Subscription from the Operator Hub:
+
+```shell
+❯ oc apply -f amq-streams-migration-og.yml
+❯ oc apply -f amq-streams-migration-subscription.yml
+```
+
+**NOTE**: This is a *namespaced* installation of the operator.
+
+You could check the status of the subscription with the following commands:
+
+```shell
+❯ oc get csv
+NAME                DISPLAY                             VERSION   REPLACES            PHASE
+amqstreams.v1.8.0   Red Hat Integration - AMQ Streams   1.8.0     amqstreams.v1.7.3   Succeeded
+```
+
+[Adding Operators to a cluster](https://docs.openshift.com/container-platform/4.8/operators/admin/olm-adding-operators-to-cluster.html) article
+describes deeply how to install Operators using OperatorHub

01-source-cluster/05-sample-apps/README.md

@@ -2,8 +2,8 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: strimzi-migration-og
-  namespace: strimzi-migration
+  name: amq-streams-migration-og
+  namespace: amq-streams-migration
 spec:
   targetNamespaces:
-  - strimzi-migration
+  - amq-streams-migration

02-target-cluster/01-amq-streams-operator/README.md

@@ -0,0 +1,13 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: amq-streams
+  namespace: amq-streams-migration
+spec:
+  channel: stable
+  installPlanApproval: Automatic
+  name: amq-streams
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+  startingCSV: amqstreams.v1.8.0

01-source-cluster/01-strimzi-operator/strimzi-migration-og.yml 02-target-cluster/01-amq-streams-operator/amq-streams-migration-og.yml

@@ -19,11 +19,11 @@ This cluster is available with the following services:
 
 ```shell
 $ oc get svc
-NAME                                      TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)                               AGE
-event-bus-kafka-bootstrap                 ClusterIP   172.30.220.206   <none>        9091/TCP,9092/TCP,9093/TCP            85m
-event-bus-kafka-brokers                   ClusterIP   None             <none>        9090/TCP,9091/TCP,9092/TCP,9093/TCP   85m
-event-bus-zookeeper-client                ClusterIP   172.30.116.168   <none>        2181/TCP                              87m
-event-bus-zookeeper-nodes                 ClusterIP   None             <none>        2181/TCP,2888/TCP,3888/TCP            87m
+NAME                         TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)                               AGE
+event-bus-kafka-bootstrap    ClusterIP   172.30.20.58    <none>        9091/TCP,9092/TCP,9093/TCP            84s
+event-bus-kafka-brokers      ClusterIP   None            <none>        9090/TCP,9091/TCP,9092/TCP,9093/TCP   84s
+event-bus-zookeeper-client   ClusterIP   172.30.119.58   <none>        2181/TCP                              3m5s
+event-bus-zookeeper-nodes    ClusterIP   None            <none>        2181/TCP,2888/TCP,3888/TCP            3m5s
 ```
 
 The ```event-bus-kafka-bootstrap``` service is used to connect the producers and consumers with this cluster.
@@ -50,18 +50,18 @@ The following pods will be deployed:
 
 ```shell
 ❯ oc get pod
-NAME                                                    READY   STATUS    RESTARTS   AGE
-amq-streams-cluster-operator-v1.8.0-66df9f665f-vlvhh    1/1     Running   0          89m
-event-bus-entity-operator-845cb76bdf-qh95r              3/3     Running   0          84m
-event-bus-kafka-0                                       1/1     Running   0          86m
-event-bus-kafka-1                                       1/1     Running   0          86m
-event-bus-kafka-2                                       1/1     Running   0          86m
-event-bus-kafka-exporter-5d75b58fc4-v6cnp               1/1     Running   0          83m
-event-bus-zookeeper-0                                   1/1     Running   0          88m
-event-bus-zookeeper-1                                   1/1     Running   0          88m
-event-bus-zookeeper-2                                   1/1     Running   0          88m
+NAME                                                READY   STATUS    RESTARTS   AGE
+event-bus-entity-operator-5fb8465fd5-s4zs2          3/3     Running   0          55s
+event-bus-kafka-0                                   1/1     Running   0          2m30s
+event-bus-kafka-1                                   1/1     Running   0          2m30s
+event-bus-kafka-2                                   1/1     Running   0          2m30s
+event-bus-kafka-exporter-6f7ffb5b8b-dzslg           1/1     Running   0          14s
+event-bus-zookeeper-0                               1/1     Running   0          4m11s
+event-bus-zookeeper-1                               1/1     Running   0          4m11s
+event-bus-zookeeper-2                               1/1     Running   0          4m11s
+amq-streams-cluster-operator-v1.8.0-66df65f-vlvhh   1/1     Running   0          6m7s
 ```
 
 References:
 
-* [Kafka Cluster Configuration](https://access.redhat.com/documentation/en-us/red_hat_amq/2021.q3/html-single/using_amq_streams_on_openshift/index#assembly-config-kafka-str)
+* [Kafka Cluster Configuration](ttps://access.redhat.com/documentation/en-us/red_hat_amq/2021.q3/html-single/using_amq_streams_on_openshift/index#assembly-config-kafka-str)

02-target-cluster/01-amq-streams-operator/amq-streams-migration-subscription.yml

@@ -35,13 +35,13 @@ sample-user-tls           event-bus   tls              simple          True
 To describe a Kafka User:
 
 ```shell
-oc get kafkauser sample-user-scram -o yaml
+oc get kafkauser admin-user-scram -o yaml
 ```
 
 Each user will have its own secret with the credentials defined it:
 
 ```shell
-❯ oc get secret sample-user-scram -o yaml
+❯ oc get secret admin-user-scram -o yaml
 apiVersion: v1
 data:
   password: ZHYwV1V5eUx6Y09x
@@ -62,33 +62,33 @@ type: Opaque
 To decrypt the password:
 
 ```shell
-❯ oc get secret sample-user-scram -o jsonpath='{.data.password}' | base64 -d
-PIPgj8f11S98
+❯ oc get secret admin-user-scram -o jsonpath='{.data.password}' | base64 -d
+N7FSt6poV2GF
 ```
 
 These users could be tested with the following sample:
 
 * Sample consumer authenticated with the ```sample-user-scram``` user:
 
 ```shell
-oc run kafka-consumer -n amq-streams-reg1-workshop -ti --image=registry.redhat.io/amq7/amq-streams-kafka-28-rhel7:1.8.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
+oc run kafka-consumer -ti --image=registry.redhat.io/amq7/amq-streams-kafka-28-rhel7:1.8.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/consumer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=PIPgj8f11S98;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=N7FSt6poV2GF;
 EOF
-bin/kafka-console-consumer.sh --bootstrap-server event-bus-reg1-kafka-bootstrap:9092 --topic apps.samples.greetings --consumer.config=/tmp/consumer.properties --group sample-group
+bin/kafka-console-consumer.sh --bootstrap-server event-bus-kafka-bootstrap:9092 --topic apps.samples.greetings --consumer.config=/tmp/consumer.properties --group sample-group
 "
 ```
 
-* Sample producer authenticated with the ```sample-user-scram``` user:
+* Sample producer authenticated with the ```admin-user-scram``` user:
 
 ```shell
-oc run kafka-producer -n amq-streams-reg1-workshop -ti --image=registry.redhat.io/amq7/amq-streams-kafka-28-rhel7:1.8.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
+oc run kafka-producer -ti --image=registry.redhat.io/amq7/amq-streams-kafka-28-rhel7:1.8.0 --rm=true --restart=Never -- /bin/bash -c "cat >/tmp/producer.properties <<EOF 
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=SCRAM-SHA-512
-sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=sample-user-scram password=PIPgj8f11S98;
+sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username=admin-user-scram password=N7FSt6poV2GF;
 EOF
-bin/kafka-console-producer.sh --broker-list event-bus-reg1-kafka-bootstrap:9092 --topic apps.samples.greetings --producer.config=/tmp/producer.properties
+bin/kafka-console-producer.sh --broker-list event-bus-kafka-bootstrap:9092 --topic apps.samples.greetings --producer.config=/tmp/producer.properties
 "
 ```
 

02-target-cluster/01-strimzi-operator/README.md

@@ -19,7 +19,8 @@ clean the secret to be created in the target cluster.
 oc get secret migration-user-tls -o yaml > source-secrets/migration-user-tls.yaml
 ```
 
-Remove the data not needed and clean the secret to be created in the target cluster.
+Remove the data not needed and clean the secret to be created in the target cluster, and rename the
+source secret name to `event-bus-source-cluster-ca-cert`:
 
 ```shell
 oc apply -f ./source-secrets/

02-target-cluster/02-kafka/README.md

@@ -11,8 +11,7 @@ spec:
   clusters:
   ############### SOURCE CLUSTER (Active) ################
   - alias: "my-source-cluster"
-    #bootstrapServers: event-bus-reg1-kafka-bootstrap.amq-streams-reg1-workshop.svc:9093
-    bootstrapServers: event-bus-kafka-bootstrap-amq-streams-migration.apps.cluster-cfc1.cfc1.example.opentlc.com:443
+    bootstrapServers: event-bus-kafka-bootstrap-amq-streams-migration.apps.<OCP_HOST>:443
     tls: 
       trustedCertificates:
       - secretName: event-bus-source-cluster-ca-cert

02-target-cluster/03-kafka-users/README.md

@@ -39,3 +39,5 @@ oc apply -f ./consumer-apps/
 
 Now you could check that the new consumers in the target cluster are consuming the data starting from the latest
 offset processed in the source cluster.
+
+Now, the last step is move your producer apps to this new Kafka cluster.

02-target-cluster/04-kafka-mirror-maker2/README.md

@@ -3,6 +3,10 @@
 This repo includes a set of resources to demonstrate how Apache MirrorMaker2 could
 help in a migration from a source Apache Kafka cluster to another Apache Kafka cluster :rocket:.
 
+**NOTE**: This branch is focused in Red Hat AMQ Streams Operators.
+
+For more context, please review our [blog post](https://blog.jromanmartin.io/2021/11/19/migrating-kafka-with-mirror-maker2.html).
+
 The scenario covered in this repo is to have an Active-Passive deployment of Apache Kafka clusters
 deployed in different OpenShift clusters.
 
@@ -13,14 +17,14 @@ This repo was tested :sparkles: in:
   * Red Hat AMQ Streams Operators 1.6.3 (Apache Kafka 2.5)
 
 * Target Environment:
-  * Red Hat OpenShift Container Platform 4.8.5
+  * Red Hat OpenShift Container Platform 4.9.0
   * Red Hat AMQ Streams Operators 1.8.0 (Apache Kafka 2.8)
 
 **NOTE**: To follow this demo you should have two different OpenShift clusters available
 following the versions described above.
 
 :rotating_light: **WARN**: This repo is not defined to be a production-ready implementation but it could be used
-as a base line to design and develop your specific use case. Use 
+as a base line to design and develop your specific use case. Use carefully and by own your responsibility.
 
 ## Migration Process Overview
 
@@ -57,8 +61,7 @@ will be the new active one and we could stop and remove the source platform.
 Apache Kafka clusters (multi-cloud, different data-flows, back-ups, ...), all of them out of the scope
 of this repo.
 
-Both Apache Kafka deployments are managed and operated by the Red Hat AMQ Streams operators. Of course,
-this scenario could be covered also by the Strimzi Operators (upstream of Red Hat AMQ Streams).
+Both Apache Kafka deployments are managed and operated by the Red Hat AMQ Streams operators.
 
 # Deploying Source Environment
 
@@ -69,11 +72,11 @@ As a normal user (non ```cluster-admin```) in your source OpenShift cluster, cre
 ❯ oc new-project amq-streams-migration
 ```
 
-### Deploying Red Hat AMQ Streams Operators
+### Deploying Strimzi Operators
 
 Follow [the instructions](./01-source-cluster/01-amq-streams-operator/README.md)
 
-### Deploying Red Hat AMQ Streams
+### Deploying Apache Kafka
 
 Follow [the instructions](./01-source-cluster/02-kafka/README.md)
 
@@ -101,11 +104,11 @@ As a normal user (non ```cluster-admin```) in your OpenShift cluster, create the
 ❯ oc new-project amq-streams-migration
 ```
 
-### Deploying Red Hat AMQ Streams Operators
+### Deploying Strimzi Operators
 
 Follow [the instructions](./02-target-cluster/01-amq-streams-operator/README.md)
 
-### Deploying Red Hat AMQ Streams
+### Deploying Apache Kafka
 
 Follow [the instructions](./02-target-cluster/02-kafka/README.md)
 
@@ -142,6 +145,7 @@ my-source-cluster.checkpoints.internal  event-bus   1            3
 
 ## References
 
+* [Migrating Kafka clusters with MirrorMaker2 and Strimzi](https://blog.jromanmartin.io/2021/11/19/migrating-kafka-with-mirror-maker2.html)
 * [Red Hat AMQ Product Documentation](https://access.redhat.com/documentation/en-us/red_hat_amq/2021.q3/)
 * [AMQ Streams on OpenShift Overview](https://access.redhat.com/documentation/en-us/red_hat_amq/2021.q3/html-single/amq_streams_on_openshift_overview/index)
 * [Using AMQ Streams on OCP](https://access.redhat.com/documentation/en-us/red_hat_amq/2021.q3/html-single/using_amq_streams_on_openshift/index)