diff options
| author | Staffan Olsson <staffan@repos.se> | 2017-06-25 06:03:01 +0200 |
|---|---|---|
| committer | Staffan Olsson <staffan@repos.se> | 2017-06-25 06:03:01 +0200 |
| commit | 401d65e9a383b43148ae9053dae05f529c7df750 (patch) | |
| tree | 624a74e893ce12c82d1b4834370e42518047250e | |
| parent | 5b8e94a0791a2bceedabcb70805924ae145ff015 (diff) | |
| parent | 15bcb8742a2937a6ff881a9b2610e8031cd1ca5e (diff) | |
| download | kubernetes-kafka-401d65e9a383b43148ae9053dae05f529c7df750.tar.gz kubernetes-kafka-401d65e9a383b43148ae9053dae05f529c7df750.tar.bz2 kubernetes-kafka-401d65e9a383b43148ae9053dae05f529c7df750.zip | |
Merge branch 'no-roundrobin-service' into kafka-011
| -rw-r--r-- | 30service.yml | 11 | ||||
| -rw-r--r-- | 50kafka.yml | 2 | ||||
| -rw-r--r-- | test/11topic-create-test1.yml | 3 | ||||
| -rw-r--r-- | test/12topic-create-test2.yml | 3 | ||||
| -rw-r--r-- | test/21consumer-test1.yml | 3 | ||||
| -rw-r--r-- | test/99testclient.yml | 3 |
6 files changed, 9 insertions, 16 deletions
diff --git a/30service.yml b/30service.yml deleted file mode 100644 index 5403da2..0000000 --- a/30service.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: kafka - namespace: kafka -spec: - ports: - - port: 9092 - selector: - app: kafka diff --git a/50kafka.yml b/50kafka.yml index 02780c8..d24e5bc 100644 --- a/50kafka.yml +++ b/50kafka.yml @@ -20,7 +20,7 @@ spec: command: - sh - -c - - "./bin/kafka-server-start.sh config/server.properties --override log.retention.hours=-1 --override broker.id=$(hostname | awk -F'-' '{print $2}')" + - "./bin/kafka-server-start.sh config/server.properties --override log.retention.hours=-1 --override broker.id=${HOSTNAME##*-}" volumeMounts: - name: datadir mountPath: /opt/kafka/data diff --git a/test/11topic-create-test1.yml b/test/11topic-create-test1.yml index fdb805e..e03c6c9 100644 --- a/test/11topic-create-test1.yml +++ b/test/11topic-create-test1.yml @@ -10,7 +10,8 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.10.0.1 + image: solsson/kafka + imagePullPolicy: Never command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/test/12topic-create-test2.yml b/test/12topic-create-test2.yml index 45d9881..9abc77f 100644 --- a/test/12topic-create-test2.yml +++ b/test/12topic-create-test2.yml @@ -10,7 +10,8 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.10.0.1 + image: solsson/kafka + imagePullPolicy: Never command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/test/21consumer-test1.yml b/test/21consumer-test1.yml index 3321873..7faf80b 100644 --- a/test/21consumer-test1.yml +++ b/test/21consumer-test1.yml @@ -14,7 +14,8 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:0.10.0.1 + image: solsson/kafka + imagePullPolicy: Never command: - ./bin/kafka-console-consumer.sh - --bootstrap-server diff --git a/test/99testclient.yml b/test/99testclient.yml index 3ffa63a..97e3dea 100644 --- a/test/99testclient.yml +++ b/test/99testclient.yml @@ -8,7 +8,8 @@ metadata: spec: containers: - name: kafka - image: solsson/kafka-persistent:0.10.1@sha256:0719b4688b666490abf4b32a3cc5c5da7bb2d6276b47377b35de5429f783e9c2 + image: solsson/kafka + imagePullPolicy: Never command: - sh - -c |