From a861237ed8b2ff6aaff46c9404f1bb5a05d82edb Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 18 Dec 2017 08:29:58 +0100
Subject: [PATCH] Modernize based on

 * https://github.com/Yolean/kubernetes-kafka/pull/107
 * https://github.com/Yolean/kubernetes-kafka/issues/101
 * https://github.com/Yolean/fluent-bit-kubernetes-kafka/commit/e045ef1ef03f9fd299575a7aa9ca312e6687e441
 * https://github.com/Yolean/kubernetes-kafka/pull/52
---
 events-kube/events-kube-kafka.yml             |  6 ++--
 events-kube/test/events-topic.yml             |  6 ++--
 .../topic-ops-kube-events-all-json.yml        | 32 -------------------
 3 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 events-kube/topic-ops-kube-events-all-json.yml

diff --git a/events-kube/events-kube-kafka.yml b/events-kube/events-kube-kafka.yml
index 0b8bf109..31703b49 100644
--- a/events-kube/events-kube-kafka.yml
+++ b/events-kube/events-kube-kafka.yml
@@ -25,12 +25,12 @@ spec:
     spec:
       containers:
       - name: kafkacat-curl
-        image: solsson/kafkacat-curl@sha256:65568eb5b0c22d360546c7591d1efdee7ce919e4b299be33c0e4b47ff997c1e8
+        image: solsson/kafkacat-curl@sha256:b5484379301937129e67550331782a0f7ac030a4b913a254d084faea4bcf44a2
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092,kafka-2.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         - name: TOPIC
-          value: ops-kube-events-all-json-001
+          value: ops.kube-events-all.stream.json.001
         command:
         - /bin/bash
         - -ec
diff --git a/events-kube/test/events-topic.yml b/events-kube/test/events-topic.yml
index 29891f72..0c48c364 100644
--- a/events-kube/test/events-topic.yml
+++ b/events-kube/test/events-topic.yml
@@ -56,12 +56,12 @@ spec:
     spec:
       containers:
       - name: testcase
-        image: solsson/kafkacat@sha256:ebebf47061300b14a4b4c2e1e4303ab29f65e4b95d34af1b14bb8f7ec6da7cef
+        image: solsson/kafkacat@sha256:2c539e4f58960ab7872976ebc664dd92de18cf27e7cbbeb296d654a2351f6ca4
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092,kafka-2.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         - name: TOPIC
-          value: ops-kube-events-all-json-001
+          value: ops.kube-events-all.stream.json.001
         command:
         - /bin/bash
         - -e
diff --git a/events-kube/topic-ops-kube-events-all-json.yml b/events-kube/topic-ops-kube-events-all-json.yml
deleted file mode 100644
index 62f2b807..00000000
--- a/events-kube/topic-ops-kube-events-all-json.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: topic-ops-kube-events-all-json
-  namespace: kafka
-spec:
-  template:
-    metadata:
-      labels:
-        app: topic-create
-        topic-id: ops-kube-events-all-json
-        topic-gen: "001"
-    spec:
-      containers:
-      - name: kafka
-        image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce
-        command:
-        - ./bin/kafka-topics.sh
-        - --zookeeper
-        - zookeeper:2181
-        - --create
-        - --if-not-exists
-        - --topic
-        - ops-kube-events-all-json-001
-        - --partitions
-        - "1"
-        - --replication-factor
-        - "1"
-        - --config
-        # 8 days
-        - retention.ms=691200000  
-      restartPolicy: Never