From a6c522fdff0838473d44efc211d621ef01e2efae Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Tue, 10 Oct 2017 17:42:37 +0200 Subject: test stub --- addon-logs/test/logs-aggregated.yml | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 addon-logs/test/logs-aggregated.yml diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml new file mode 100644 index 0000000..9934570 --- /dev/null +++ b/addon-logs/test/logs-aggregated.yml @@ -0,0 +1,67 @@ +--- +kind: ConfigMap +metadata: + name: test-logs-aggregated + namespace: test-kafka +apiVersion: v1 +data: + + setup.sh: |- + touch /tmp/testlog + + tail -f /tmp/testlog + + continue.sh: |- + exit 0 + + run.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:decb4e4a0e722c8e202bd05e81c43b94d87c6cba977f90d16623e74027045000 + 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: ZOOKEEPER + value: zookeeper.kafka.svc.cluster.local:2181 + # Test set up + command: + - /bin/bash + - -e + - /test/setup.sh + # Test run, again and again + readinessProbe: + exec: + command: + - /bin/bash + - -e + - /test/run.sh + # Test quit on nonzero exit + livenessProbe: + exec: + command: + - /bin/bash + - -e + - /test/continue.sh + volumeMounts: + - name: config + mountPath: /test + volumes: + - name: config + configMap: + name: test-logs-aggregated -- cgit v1.2.3 From a693a22008f1ccbad5e383ef6ce27604f433b1fc Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Tue, 10 Oct 2017 17:43:40 +0200 Subject: Prints only some logs to test log, to avoid an infinite loop of aggregation --- addon-logs/test/logs-aggregated.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml index 9934570..170a2f9 100644 --- a/addon-logs/test/logs-aggregated.yml +++ b/addon-logs/test/logs-aggregated.yml @@ -12,6 +12,10 @@ data: tail -f /tmp/testlog continue.sh: |- + + echo "--- $(date -u --iso-8601='ns') ---" >> /tmp/testlog + kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '%t [%p] %o: %k = %s\n' -o -10 -e >> /tmp/testlog + exit 0 run.sh: |- @@ -33,12 +37,12 @@ spec: spec: containers: - name: testcase - image: solsson/kafkacat@sha256:decb4e4a0e722c8e202bd05e81c43b94d87c6cba977f90d16623e74027045000 + image: solsson/kafkacat@sha256:9cee76d02eee590c4874c42ca2e10de22d15c2dfa5b67205e35089a49cfba1f4 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: ZOOKEEPER - value: zookeeper.kafka.svc.cluster.local:2181 + - name: TOPIC + value: ops-kube-logs-raw-001 # Test set up command: - /bin/bash -- cgit v1.2.3 From efa3676b922693709a9df5bd3e34541ac045a75d Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 11 Oct 2017 07:41:27 +0200 Subject: Makes test printout compatible with jq --- addon-logs/test/logs-aggregated.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml index 170a2f9..31edd07 100644 --- a/addon-logs/test/logs-aggregated.yml +++ b/addon-logs/test/logs-aggregated.yml @@ -13,8 +13,8 @@ data: continue.sh: |- - echo "--- $(date -u --iso-8601='ns') ---" >> /tmp/testlog - kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '%t [%p] %o: %k = %s\n' -o -10 -e >> /tmp/testlog + echo "{\"#---\":\"$(date -u --iso-8601='ns')\"}" >> /tmp/testlog + kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '{"#topic":"%t","#partition":%p,"#offset":%o,"#key":"%k","=":%s}\n' -o -10 -e >> /tmp/testlog exit 0 -- cgit v1.2.3 From 0b0cbfd3f2af3001a57aa1dfe732c79e80e08ec8 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 11 Oct 2017 17:08:05 +0200 Subject: Intuitively the exit condition should be last, I think --- test/basic-produce-consume.yml | 6 +++--- test/basic-with-kafkacat.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 -- cgit v1.2.3 From 0806ce0593bee0eba5b27415e3d1af1f721b46ec Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sat, 4 Nov 2017 11:00:36 +0100 Subject: Uses latest kafkacat build for logs test --- addon-logs/test/logs-aggregated.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml index 31edd07..e4d1807 100644 --- a/addon-logs/test/logs-aggregated.yml +++ b/addon-logs/test/logs-aggregated.yml @@ -37,7 +37,7 @@ spec: spec: containers: - name: testcase - image: solsson/kafkacat@sha256:9cee76d02eee590c4874c42ca2e10de22d15c2dfa5b67205e35089a49cfba1f4 + 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 -- cgit v1.2.3 From 959d4c5cafa70db1aaef1f8ea4d1d7008dc449bb Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sat, 4 Nov 2017 11:00:57 +0100 Subject: Refreshes test syntax from Yolean/kube-test --- addon-logs/test/logs-aggregated.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/addon-logs/test/logs-aggregated.yml b/addon-logs/test/logs-aggregated.yml index e4d1807..dc6ed42 100644 --- a/addon-logs/test/logs-aggregated.yml +++ b/addon-logs/test/logs-aggregated.yml @@ -11,14 +11,16 @@ data: tail -f /tmp/testlog - continue.sh: |- + test.sh: |- + exec >> /tmp/testlog + exec 2>&1 - echo "{\"#---\":\"$(date -u --iso-8601='ns')\"}" >> /tmp/testlog - kafkacat -b $BOOTSTRAP -C -t $TOPIC -f '{"#topic":"%t","#partition":%p,"#offset":%o,"#key":"%k","=":%s}\n' -o -10 -e >> /tmp/testlog + 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 - run.sh: |- + quit-on-nonzero-exit.sh: |- exit 0 --- @@ -43,25 +45,22 @@ spec: 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 - # Test set up command: - /bin/bash - -e - /test/setup.sh - # Test run, again and again readinessProbe: exec: command: - /bin/bash - -e - - /test/run.sh - # Test quit on nonzero exit + - /test/test.sh livenessProbe: exec: command: - /bin/bash - -e - - /test/continue.sh + - /test/quit-on-nonzero-exit.sh volumeMounts: - name: config mountPath: /test -- cgit v1.2.3 From eb2f8958af34ead5533f68fed783f749154b56fb Mon Sep 17 00:00:00 2001 From: Staffan Olsson 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