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 --- addon-events/events-kube-kafka.yml | 46 ---------------------- addon-events/topic-ops-kube-events-all-json.yml | 32 ---------------- events-kube/events-kube-kafka.yml | 51 +++++++++++++++++++++++++ events-kube/test/events-topic.yml | 27 +++++++++++++ events-kube/topic-ops-kube-events-all-json.yml | 32 ++++++++++++++++ test/events-topic.yml | 24 ------------ 6 files changed, 110 insertions(+), 102 deletions(-) delete mode 100644 addon-events/events-kube-kafka.yml delete mode 100644 addon-events/topic-ops-kube-events-all-json.yml create mode 100644 events-kube/events-kube-kafka.yml create mode 100644 events-kube/test/events-topic.yml create mode 100644 events-kube/topic-ops-kube-events-all-json.yml delete mode 100644 test/events-topic.yml diff --git a/addon-events/events-kube-kafka.yml b/addon-events/events-kube-kafka.yml deleted file mode 100644 index 2cd1891..0000000 --- a/addon-events/events-kube-kafka.yml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: events-kube-kafka - namespace: kafka -spec: - replicas: 1 - strategy: - type: RollingUpdate - rollingUpdate: - # prefer duplicate events over missed - maxUnavailable: 0 - maxSurge: 1 - template: - metadata: - labels: - app: events - from: kube - to: kafka - spec: - containers: - - name: kafkacat-curl - image: solsson/kafkacat-curl@sha256:6ad61f2e6343359c3972d7a86815568c0a1d0560068134c5d702a152eb5123a0 - 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: - - /bin/bash - - -ec - - > - curl - -f - -s - --cacert /run/secrets/kubernetes.io/serviceaccount/ca.crt - --header "Authorization: Bearer $(cat /run/secrets/kubernetes.io/serviceaccount/token)" - https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT/api/v1/watch/events - | - kafkacat - -b $BOOTSTRAP - -t $TOPIC - -P - -z snappy - -v - -d broker,topic diff --git a/addon-events/topic-ops-kube-events-all-json.yml b/addon-events/topic-ops-kube-events-all-json.yml deleted file mode 100644 index 8eb3b66..0000000 --- a/addon-events/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 - # this might be eight days - - retention.ms=69125000 - restartPolicy: Never diff --git a/events-kube/events-kube-kafka.yml b/events-kube/events-kube-kafka.yml new file mode 100644 index 0000000..769fad1 --- /dev/null +++ b/events-kube/events-kube-kafka.yml @@ -0,0 +1,51 @@ +apiVersion: extensions/v1beta2 +kind: Deployment +metadata: + name: events-kube-kafka + namespace: kafka +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + # prefer duplicate events over missed + maxUnavailable: 0 + maxSurge: 1 + selector: + matchLabels: + app: events + from: kube + to: kafka + template: + metadata: + labels: + app: events + from: kube + to: kafka + spec: + containers: + - name: kafkacat-curl + image: solsson/kafkacat-curl@sha256:6ad61f2e6343359c3972d7a86815568c0a1d0560068134c5d702a152eb5123a0 + 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: + - /bin/bash + - -ec + - > + curl + -f + -s + --cacert /run/secrets/kubernetes.io/serviceaccount/ca.crt + --header "Authorization: Bearer $(cat /run/secrets/kubernetes.io/serviceaccount/token)" + https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT/api/v1/watch/events + | + kafkacat + -b $BOOTSTRAP + -t $TOPIC + -P + -z snappy + -v + -d broker,topic 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 diff --git a/events-kube/topic-ops-kube-events-all-json.yml b/events-kube/topic-ops-kube-events-all-json.yml new file mode 100644 index 0000000..8eb3b66 --- /dev/null +++ b/events-kube/topic-ops-kube-events-all-json.yml @@ -0,0 +1,32 @@ +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 + # this might be eight days + - retention.ms=69125000 + restartPolicy: Never diff --git a/test/events-topic.yml b/test/events-topic.yml deleted file mode 100644 index 68ca919..0000000 --- a/test/events-topic.yml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: events-topic - namespace: test-kafka -spec: - replicas: 1 - 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