From eb2f8958af34ead5533f68fed783f749154b56fb Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Sat, 4 Nov 2017 11:08:23 +0100
Subject: Updates manifest to k8s 1.8

---
 addon-logs/test/logs-aggregated.yml     | 70 -------------------------------
 logs-streaming/test/logs-aggregated.yml | 74 +++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 70 deletions(-)
 delete mode 100644 addon-logs/test/logs-aggregated.yml
 create mode 100644 logs-streaming/test/logs-aggregated.yml

diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml
deleted file mode 100644
index dc6ed42..0000000
--- a/addon-logs/test/logs-aggregated.yml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-kind: ConfigMap
-metadata:
-  name: test-logs-aggregated
-  namespace: test-kafka
-apiVersion: v1
-data:
-
-  setup.sh: |-
-    touch /tmp/testlog
-
-    tail -f /tmp/testlog
-
-  test.sh: |-
-    exec >> /tmp/testlog
-    exec 2>&1
-
-    echo "{\"#---\":\"$(date -u --iso-8601='ns')\"}"
-    kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '{"#topic":"%t","#partition":%p,"#offset":%o,"#key":"%k","=":%s}\n' -o -10 -e
-
-    exit 0
-
-  quit-on-nonzero-exit.sh: |-
-    exit 0
-
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: test-logs-aggregated
-  namespace: test-kafka
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        test-target: kafka
-        test-type: readiness
-    spec:
-      containers:
-      - name: testcase
-        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
-        - name: TOPIC
-          value: ops-kube-logs-raw-001
-        command:
-        - /bin/bash
-        - -e
-        - /test/setup.sh
-        readinessProbe:
-          exec:
-            command:
-            - /bin/bash
-            - -e
-            - /test/test.sh
-        livenessProbe:
-          exec:
-            command:
-            - /bin/bash
-            - -e
-            - /test/quit-on-nonzero-exit.sh
-        volumeMounts:
-        - name: config
-          mountPath: /test
-      volumes:
-      - name: config
-        configMap:
-          name: test-logs-aggregated
diff --git a/logs-streaming/test/logs-aggregated.yml b/logs-streaming/test/logs-aggregated.yml
new file mode 100644
index 0000000..6356b68
--- /dev/null
+++ b/logs-streaming/test/logs-aggregated.yml
@@ -0,0 +1,74 @@
+---
+kind: ConfigMap
+metadata:
+  name: test-logs-aggregated
+  namespace: test-kafka
+apiVersion: v1
+data:
+
+  setup.sh: |-
+    touch /tmp/testlog
+
+    tail -f /tmp/testlog
+
+  test.sh: |-
+    exec >> /tmp/testlog
+    exec 2>&1
+
+    echo "{\"#---\":\"$(date -u --iso-8601='ns')\"}"
+    kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '{"#topic":"%t","#partition":%p,"#offset":%o,"#key":"%k","=":%s}\n' -o -10 -e
+
+    exit 0
+
+  quit-on-nonzero-exit.sh: |-
+    exit 0
+
+---
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: test-logs-aggregated
+  namespace: test-kafka
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      test-target: logs-streaming
+      test-type: readiness
+  template:
+    metadata:
+      labels:
+        test-target: logs-streaming
+        test-type: readiness
+    spec:
+      containers:
+      - name: testcase
+        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
+        - name: TOPIC
+          value: ops-kube-logs-raw-001
+        command:
+        - /bin/bash
+        - -e
+        - /test/setup.sh
+        readinessProbe:
+          exec:
+            command:
+            - /bin/bash
+            - -e
+            - /test/test.sh
+        livenessProbe:
+          exec:
+            command:
+            - /bin/bash
+            - -e
+            - /test/quit-on-nonzero-exit.sh
+        volumeMounts:
+        - name: config
+          mountPath: /test
+      volumes:
+      - name: config
+        configMap:
+          name: test-logs-aggregated
-- 
cgit v1.2.3