From 72ca76dbd2409c3bf0083cd89aa382ff40705f13 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sat, 29 Sep 2018 14:27:42 +0200 Subject: [PATCH] Turns out we didn't need the ps command anyway This reverts commit c60c28df526defb55b80d4f1c372658dbea128ba. --- avro-tools/test/rest-curl.yml | 2 +- kafka/50kafka.yml | 2 +- kafka/test/kafkacat.yml | 2 +- kafka/test/produce-consume.yml | 6 +++--- maintenance/preferred-replica-election-job.yml | 2 +- maintenance/reassign-paritions-job.yml | 2 +- maintenance/replication-factor-increase-job.yml | 2 +- zookeeper/50pzoo.yml | 2 +- zookeeper/51zoo.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/avro-tools/test/rest-curl.yml b/avro-tools/test/rest-curl.yml index f6ee66d6..7a42219b 100644 --- a/avro-tools/test/rest-curl.yml +++ b/avro-tools/test/rest-curl.yml @@ -114,7 +114,7 @@ spec: spec: containers: - name: topic-create - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml index ba14d01e..376d063a 100644 --- a/kafka/50kafka.yml +++ b/kafka/50kafka.yml @@ -42,7 +42,7 @@ spec: mountPath: /etc/kafka containers: - name: broker - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties diff --git a/kafka/test/kafkacat.yml b/kafka/test/kafkacat.yml index c934fdf0..f551fbdd 100644 --- a/kafka/test/kafkacat.yml +++ b/kafka/test/kafkacat.yml @@ -72,7 +72,7 @@ spec: spec: containers: - name: topic-create - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 command: - ./bin/kafka-topics.sh - --zookeeper diff --git a/kafka/test/produce-consume.yml b/kafka/test/produce-consume.yml index 570c471c..d5aaf8b6 100644 --- a/kafka/test/produce-consume.yml +++ b/kafka/test/produce-consume.yml @@ -55,7 +55,7 @@ spec: spec: containers: - name: topic-create - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 command: - ./bin/kafka-topics.sh - --zookeeper @@ -95,7 +95,7 @@ spec: spec: containers: - name: producer - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: BOOTSTRAP value: bootstrap.kafka:9092 @@ -114,7 +114,7 @@ spec: - name: shared mountPath: /shared - name: consumer - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: BOOTSTRAP value: bootstrap.kafka:9092 diff --git a/maintenance/preferred-replica-election-job.yml b/maintenance/preferred-replica-election-job.yml index 5e9acc2c..f3cfa83e 100644 --- a/maintenance/preferred-replica-election-job.yml +++ b/maintenance/preferred-replica-election-job.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 command: - ./bin/kafka-preferred-replica-election.sh - --zookeeper diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml index 5bdb6101..317d9110 100644 --- a/maintenance/reassign-paritions-job.yml +++ b/maintenance/reassign-paritions-job.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: ZOOKEEPER value: zookeeper.kafka:2181 diff --git a/maintenance/replication-factor-increase-job.yml b/maintenance/replication-factor-increase-job.yml index 31fb0a7b..00a13ae8 100644 --- a/maintenance/replication-factor-increase-job.yml +++ b/maintenance/replication-factor-increase-job.yml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kafka - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: ZOOKEEPER value: zookeeper.kafka:2181 diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index b6b0e2a4..68e1dbdd 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -33,7 +33,7 @@ spec: mountPath: /var/lib/zookeeper/data containers: - name: zookeeper - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index f423896f..42c12128 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -36,7 +36,7 @@ spec: mountPath: /var/lib/zookeeper/data containers: - name: zookeeper - image: solsson/kafka:1.0.2-ps@sha256:632da34b98ec5b1161086d3c30eb062a319d6658db1732deeeede0593dd2b1a1 + image: solsson/kafka:1.0.2@sha256:7fdb326994bcde133c777d888d06863b7c1a0e80f043582816715d76643ab789 env: - name: KAFKA_LOG4J_OPTS value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties