From 071f973fd2210cb5dc3edca17682e4b520b68b71 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 27 Oct 2017 08:33:39 +0200 Subject: Manifests updated to 1.8 and v3.0.0 pre-merge --- events-kube/test/events-topic.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 events-kube/test/events-topic.yml (limited to 'events-kube/test/events-topic.yml') diff --git a/events-kube/test/events-topic.yml b/events-kube/test/events-topic.yml new file mode 100644 index 0000000..bbed4fa --- /dev/null +++ b/events-kube/test/events-topic.yml @@ -0,0 +1,27 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: events-topic + namespace: test-kafka +spec: + replicas: 1 + selector: + matchLabels: + test-target: events-topic + template: + metadata: + labels: + test-target: events-topic + # Would be a valid testcase if it verifies that >0 messages per some time unit have been produced + #test-type: readiness + spec: + containers: + - name: kafkacat + image: solsson/kafkacat@sha256:36d1f191cc33a8365074280279205e6b4f52cd8cc8fb1b896bb4c943c9dee8f8 + command: + - kafkacat + - -b + - kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092,kafka-2.broker.kafka.svc.cluster.local:9092 + - -t + - ops-kube-events-all-json-001 + - -C -- cgit v1.2.3 From 1de4d2cb4452b47f2755cbe94b655d3aad2ead13 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 27 Oct 2017 10:08:41 +0200 Subject: An actual assertion --- events-kube/test/events-topic.yml | 82 ++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 10 deletions(-) (limited to 'events-kube/test/events-topic.yml') diff --git a/events-kube/test/events-topic.yml b/events-kube/test/events-topic.yml index bbed4fa..126d4fb 100644 --- a/events-kube/test/events-topic.yml +++ b/events-kube/test/events-topic.yml @@ -1,3 +1,34 @@ +--- +kind: ConfigMap +metadata: + name: events-topic + namespace: test-kafka +apiVersion: v1 +data: + + setup.sh: |- + touch /tmp/testlog + + tail -f /tmp/testlog + + test.sh: |- + exec >> /tmp/testlog + exec 2>&1 + + PREVIOUS=$(sha1sum /tmp/event || echo "") + kafkacat -b $BOOTSTRAP -t $TOPIC -C -o -1 -c 1 | tee /tmp/event + CURRENT=$(sha1sum /tmp/event) + [ "$PREVIOUS" == "$CURRENT" ] && echo "{\"test-status\”: \"No new event in $TOPIC\"}" && exit 1 + + exit 0 + + quit-on-nonzero-exit.sh: |- + exec >> /tmp/testlog + exec 2>&1 + + exit 0 + +--- apiVersion: apps/v1beta2 kind: Deployment metadata: @@ -5,23 +36,54 @@ metadata: namespace: test-kafka spec: replicas: 1 + strategy: + type: Recreate selector: matchLabels: test-target: events-topic + test-type: readiness template: metadata: labels: test-target: events-topic - # Would be a valid testcase if it verifies that >0 messages per some time unit have been produced - #test-type: readiness + test-type: readiness + # for example: + # readonly - can be used in production + # isolated - read/write but in a manner that does not affect other services + # load - unsuitable for production because it uses significant resources + # chaos - unsuitable for production because it injects failure modes + #test-use: spec: containers: - - name: kafkacat - image: solsson/kafkacat@sha256:36d1f191cc33a8365074280279205e6b4f52cd8cc8fb1b896bb4c943c9dee8f8 + - 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-events-all-json-001 command: - - kafkacat - - -b - - kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092,kafka-2.broker.kafka.svc.cluster.local:9092 - - -t - - ops-kube-events-all-json-001 - - -C + - /bin/bash + - -e + - /test/setup.sh + readinessProbe: + exec: + command: + - /bin/bash + - -e + - /test/test.sh + initialDelaySeconds: 10 + periodSeconds: 10 + livenessProbe: + exec: + command: + - /bin/bash + - -e + - /test/quit-on-nonzero-exit.sh + volumeMounts: + - name: config + mountPath: /test + volumes: + - name: config + configMap: + name: events-topic -- cgit v1.2.3 From 8eb4a4d272a78a8f75e29a7ab4339b6bbc3787a7 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 27 Oct 2017 11:04:29 +0200 Subject: Needs to be tweaked depending on the churn --- events-kube/test/events-topic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'events-kube/test/events-topic.yml') diff --git a/events-kube/test/events-topic.yml b/events-kube/test/events-topic.yml index 126d4fb..844c136 100644 --- a/events-kube/test/events-topic.yml +++ b/events-kube/test/events-topic.yml @@ -73,7 +73,7 @@ spec: - -e - /test/test.sh initialDelaySeconds: 10 - periodSeconds: 10 + periodSeconds: 60 livenessProbe: exec: command: -- cgit v1.2.3 From 8ee3bebca5f979b4f99b213042181c1d9a1a3098 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 27 Oct 2017 13:04:52 +0200 Subject: Fixes JSON syntax, topic is jq:able now --- events-kube/test/events-topic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'events-kube/test/events-topic.yml') diff --git a/events-kube/test/events-topic.yml b/events-kube/test/events-topic.yml index 844c136..29891f7 100644 --- a/events-kube/test/events-topic.yml +++ b/events-kube/test/events-topic.yml @@ -15,10 +15,10 @@ data: exec >> /tmp/testlog exec 2>&1 - PREVIOUS=$(sha1sum /tmp/event || echo "") + PREVIOUS=$(sha1sum /tmp/event 2>/dev/null || echo "") kafkacat -b $BOOTSTRAP -t $TOPIC -C -o -1 -c 1 | tee /tmp/event CURRENT=$(sha1sum /tmp/event) - [ "$PREVIOUS" == "$CURRENT" ] && echo "{\"test-status\”: \"No new event in $TOPIC\"}" && exit 1 + [ "$PREVIOUS" == "$CURRENT" ] && echo "{\"test-result\": \"No new event in $TOPIC\"}" && exit 1 exit 0 -- cgit v1.2.3 From a861237ed8b2ff6aaff46c9404f1bb5a05d82edb Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Mon, 18 Dec 2017 08:29:58 +0100 Subject: 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 ++--- events-kube/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 (limited to 'events-kube/test/events-topic.yml') diff --git a/events-kube/events-kube-kafka.yml b/events-kube/events-kube-kafka.yml index 0b8bf10..31703b4 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 29891f7..0c48c36 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 62f2b80..0000000 --- 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 -- cgit v1.2.3