From b1d7a8338cee617f8cb77f5638bc6e0d9e03e692 Mon Sep 17 00:00:00 2001
From: Jakub Scholz <www@scholzj.com>
Date: Thu, 10 Dec 2020 17:45:38 +0100
Subject: [PATCH] Add the inter.broker.protocol.version to our examples

Signed-off-by: Jakub Scholz <www@scholzj.com>
---
 examples/cruise-control/kafka-cruise-control.yaml              | 1 +
 examples/kafka/kafka-ephemeral-single.yaml                     | 1 +
 examples/kafka/kafka-ephemeral.yaml                            | 1 +
 examples/kafka/kafka-jbod.yaml                                 | 1 +
 examples/kafka/kafka-persistent-single.yaml                    | 1 +
 examples/kafka/kafka-persistent.yaml                           | 1 +
 examples/metrics/jmxtrans/jmxtrans.yaml                        | 1 +
 examples/metrics/kafka-cruise-control-metrics.yaml             | 1 +
 examples/metrics/kafka-metrics.yaml                            | 1 +
 examples/mirror-maker/kafka-source.yaml                        | 1 +
 examples/mirror-maker/kafka-target.yaml                        | 1 +
 examples/security/scram-sha-512-auth/kafka.yaml                | 1 +
 examples/security/tls-auth/kafka.yaml                          | 1 +
 examples/templates/cluster-operator/ephemeral-template.yaml    | 1 +
 examples/templates/cluster-operator/persistent-template.yaml   | 1 +
 .../manifests/amq-streams.v1.6.0.clusterserviceversion.yaml    | 3 ++-
 16 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/examples/cruise-control/kafka-cruise-control.yaml b/examples/cruise-control/kafka-cruise-control.yaml
index a0d37b7f..2a8142d2 100644
--- a/examples/cruise-control/kafka-cruise-control.yaml
+++ b/examples/cruise-control/kafka-cruise-control.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-ephemeral-single.yaml b/examples/kafka/kafka-ephemeral-single.yaml
index 98bcd7c9..c7461959 100644
--- a/examples/kafka/kafka-ephemeral-single.yaml
+++ b/examples/kafka/kafka-ephemeral-single.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-ephemeral.yaml b/examples/kafka/kafka-ephemeral.yaml
index 25d17498..a7a2fe25 100644
--- a/examples/kafka/kafka-ephemeral.yaml
+++ b/examples/kafka/kafka-ephemeral.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-jbod.yaml b/examples/kafka/kafka-jbod.yaml
index efd7394a..b1a52f91 100644
--- a/examples/kafka/kafka-jbod.yaml
+++ b/examples/kafka/kafka-jbod.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/kafka/kafka-persistent-single.yaml b/examples/kafka/kafka-persistent-single.yaml
index 4798fb4b..35a0648a 100644
--- a/examples/kafka/kafka-persistent-single.yaml
+++ b/examples/kafka/kafka-persistent-single.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/kafka/kafka-persistent.yaml b/examples/kafka/kafka-persistent.yaml
index 8adb23b3..2fb91654 100644
--- a/examples/kafka/kafka-persistent.yaml
+++ b/examples/kafka/kafka-persistent.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/metrics/jmxtrans/jmxtrans.yaml b/examples/metrics/jmxtrans/jmxtrans.yaml
index c1e67372..ca1fb1b6 100644
--- a/examples/metrics/jmxtrans/jmxtrans.yaml
+++ b/examples/metrics/jmxtrans/jmxtrans.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: ephemeral
     jmxOptions:
diff --git a/examples/metrics/kafka-cruise-control-metrics.yaml b/examples/metrics/kafka-cruise-control-metrics.yaml
index f02b924d..2268bce6 100644
--- a/examples/metrics/kafka-cruise-control-metrics.yaml
+++ b/examples/metrics/kafka-cruise-control-metrics.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/metrics/kafka-metrics.yaml b/examples/metrics/kafka-metrics.yaml
index 1fa0ae4b..cc84c350 100644
--- a/examples/metrics/kafka-metrics.yaml
+++ b/examples/metrics/kafka-metrics.yaml
@@ -26,6 +26,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/mirror-maker/kafka-source.yaml b/examples/mirror-maker/kafka-source.yaml
index 47bca469..1e1aff88 100644
--- a/examples/mirror-maker/kafka-source.yaml
+++ b/examples/mirror-maker/kafka-source.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/mirror-maker/kafka-target.yaml b/examples/mirror-maker/kafka-target.yaml
index a1a8f4b9..b2b5c1b9 100644
--- a/examples/mirror-maker/kafka-target.yaml
+++ b/examples/mirror-maker/kafka-target.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/security/scram-sha-512-auth/kafka.yaml b/examples/security/scram-sha-512-auth/kafka.yaml
index d9843736..539bb04c 100644
--- a/examples/security/scram-sha-512-auth/kafka.yaml
+++ b/examples/security/scram-sha-512-auth/kafka.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/security/tls-auth/kafka.yaml b/examples/security/tls-auth/kafka.yaml
index 6fe823a2..a6d20a95 100644
--- a/examples/security/tls-auth/kafka.yaml
+++ b/examples/security/tls-auth/kafka.yaml
@@ -20,6 +20,7 @@ spec:
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
       log.message.format.version: "2.6"
+      inter.broker.protocol.version: "2.6"
     storage:
       type: jbod
       volumes:
diff --git a/examples/templates/cluster-operator/ephemeral-template.yaml b/examples/templates/cluster-operator/ephemeral-template.yaml
index 8378b8e5..470ca6da 100644
--- a/examples/templates/cluster-operator/ephemeral-template.yaml
+++ b/examples/templates/cluster-operator/ephemeral-template.yaml
@@ -94,6 +94,7 @@ objects:
         offsets.topic.replication.factor: ${KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR}
         transaction.state.log.replication.factor: ${KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR}
         log.message.format.version: ${KAFKA_VERSION}
+        inter.broker.protocol.version: ${KAFKA_VERSION}
     zookeeper:
       replicas: ${{ZOOKEEPER_NODE_COUNT}}
       livenessProbe:
diff --git a/examples/templates/cluster-operator/persistent-template.yaml b/examples/templates/cluster-operator/persistent-template.yaml
index 9addc9e9..22c573e8 100644
--- a/examples/templates/cluster-operator/persistent-template.yaml
+++ b/examples/templates/cluster-operator/persistent-template.yaml
@@ -105,6 +105,7 @@ objects:
         offsets.topic.replication.factor: ${KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR}
         transaction.state.log.replication.factor: ${KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR}
         log.message.format.version: ${KAFKA_VERSION}
+        inter.broker.protocol.version: ${KAFKA_VERSION}
     zookeeper:
       replicas: ${{ZOOKEEPER_NODE_COUNT}}
       livenessProbe:
diff --git a/operator-metadata/manifests/amq-streams.v1.6.0.clusterserviceversion.yaml b/operator-metadata/manifests/amq-streams.v1.6.0.clusterserviceversion.yaml
index 0d6d64e7..23a5730a 100644
--- a/operator-metadata/manifests/amq-streams.v1.6.0.clusterserviceversion.yaml
+++ b/operator-metadata/manifests/amq-streams.v1.6.0.clusterserviceversion.yaml
@@ -67,7 +67,8 @@ metadata:
                   "offsets.topic.replication.factor":3,
                   "transaction.state.log.replication.factor":3,
                   "transaction.state.log.min.isr":2,
-                  "log.message.format.version":"2.6"
+                  "log.message.format.version":"2.6",
+                  "inter.broker.protocol.version":"2.6"
                 },
                 "storage":{
                   "type":"ephemeral"