From 9ad41343c276cbf5aeba5c0fde27bee9cc50084a Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 8 Jan 2018 12:52:21 +0100
Subject: [PATCH] Adapts topic to our naming convention (#101)

---
 logs-streaming/test/logs-fluentbit.yml        |  4 +--
 .../topic-fluent-bit-kubernetes-logging.yml   | 32 -------------------
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 logs-streaming/topic-fluent-bit-kubernetes-logging.yml

diff --git a/logs-streaming/test/logs-fluentbit.yml b/logs-streaming/test/logs-fluentbit.yml
index 909833bb..86af0e3b 100644
--- a/logs-streaming/test/logs-fluentbit.yml
+++ b/logs-streaming/test/logs-fluentbit.yml
@@ -47,9 +47,9 @@ spec:
         image: solsson/kafkacat@sha256:ebebf47061300b14a4b4c2e1e4303ab29f65e4b95d34af1b14bb8f7ec6da7cef
         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-logs-fluentbit-001
+          value: ops.kube-logs-fluentbit.stream.json.001
         command:
         - /bin/bash
         - -e
diff --git a/logs-streaming/topic-fluent-bit-kubernetes-logging.yml b/logs-streaming/topic-fluent-bit-kubernetes-logging.yml
deleted file mode 100644
index cb27e884..00000000
--- a/logs-streaming/topic-fluent-bit-kubernetes-logging.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: topic-ops-kube-logs-fluentbit
-  # same namespace as https://github.com/fluent/fluent-bit-kubernetes-logging
-  namespace: logging
-spec:
-  template:
-    metadata:
-      labels:
-        app: topic-create
-        topic-id: ops-kube-logs-fluentbit
-        topic-gen: "001"
-    spec:
-      containers:
-      - name: kafka
-        image: solsson/kafka:1.0.0@sha256:17fdf1637426f45c93c65826670542e36b9f3394ede1cb61885c6a4befa8f72d
-        command:
-        - ./bin/kafka-topics.sh
-        - --zookeeper
-        - zookeeper.kafka:2181
-        - --create
-        - --if-not-exists
-        - --topic
-        - ops-kube-logs-fluentbit-001
-        - --partitions
-        - "1"
-        - --replication-factor
-        - "2"
-        - --config
-        - retention.ms=6912500000
-      restartPolicy: Never