Temp commit so that github allows a PR to be created, where I can keep notes

Author: solsson

10broker-config.yml

@@ -34,6 +34,8 @@ data:
     # The id of the broker. This must be set to a unique integer for each broker.
     broker.id=${KAFKA_BROKER_ID}
 
+    #broker.rack=${KAFKA_BROKER_RACK}
+
     # Switch to enable topic deletion or not, default value is false
     #delete.topic.enable=true
 

50kafka.yml

@@ -29,6 +29,7 @@ spec:
         ports:
         - containerPort: 9092
         command:
+<<<<<<< HEAD
         - ./bin/kafka-server-start.sh
         - /etc/kafka/server.properties
         - --override
@@ -39,6 +40,17 @@ spec:
         -   log.dirs=/var/lib/kafka/data/topics
         - --override
         -   auto.create.topics.enable=false
+=======
+        - /bin/bash
+        - -c
+        - >
+          ./bin/kafka-server-start.sh
+          config/server.properties
+          --override log.retention.hours=-1
+          --override log.dirs=/var/lib/kafka/data/topics
+          --override broker.id=${HOSTNAME##*-}
+          --override broker.rack=$(echo TODO-how-do-we-get-the-zone-name-here)
+>>>>>>> Temp commit so that github allows a PR to be created, where I can keep notes
         resources:
           requests:
             cpu: 100m