aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffan Olsson <staffan@repos.se>2017-11-04 11:12:21 +0100
committerStaffan Olsson <staffan@repos.se>2017-11-04 11:12:21 +0100
commite34628dc1cbab69e2d7b77bdbbaebc145abf5569 (patch)
tree93464105243782c05014e1bbb0b44df0d57e1dd3
parentebfbfc0f1a2029e010c149b04c7531e31e7079c8 (diff)
parenteb2f8958af34ead5533f68fed783f749154b56fb (diff)
downloadkubernetes-kafka-e34628dc1cbab69e2d7b77bdbbaebc145abf5569.tar.gz
kubernetes-kafka-e34628dc1cbab69e2d7b77bdbbaebc145abf5569.tar.bz2
kubernetes-kafka-e34628dc1cbab69e2d7b77bdbbaebc145abf5569.zip
Merge branch 'logs-streaming-test' into 1.8-logs-streaming
-rw-r--r--logs-streaming/test/logs-aggregated.yml74
-rw-r--r--test/basic-produce-consume.yml6
-rw-r--r--test/basic-with-kafkacat.yml6
3 files changed, 80 insertions, 6 deletions
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
diff --git a/test/basic-produce-consume.yml b/test/basic-produce-consume.yml
index 128a00a..66dda32 100644
--- a/test/basic-produce-consume.yml
+++ b/test/basic-produce-consume.yml
@@ -18,9 +18,6 @@ data:
tail -f /tmp/testlog
- continue.sh: |-
- exit 0
-
run.sh: |-
exec >> /tmp/testlog
exec 2>&1
@@ -37,6 +34,9 @@ data:
exit 0
+ continue.sh: |-
+ exit 0
+
---
apiVersion: apps/v1beta1
kind: Deployment
diff --git a/test/basic-with-kafkacat.yml b/test/basic-with-kafkacat.yml
index 405a798..cb6f667 100644
--- a/test/basic-with-kafkacat.yml
+++ b/test/basic-with-kafkacat.yml
@@ -10,9 +10,6 @@ data:
touch /tmp/testlog
tail -f /tmp/testlog
- continue.sh: |-
- exit 0
-
run.sh: |-
exec >> /tmp/testlog
exec 2>&1
@@ -24,6 +21,9 @@ data:
exit 0
+ continue.sh: |-
+ exit 0
+
---
apiVersion: batch/v1
kind: Job