Skip to content

Commit

Permalink
Merge pull request #248 from Yolean/kafka-211
Browse files Browse the repository at this point in the history
Bump Kafka to 2.1.1
  • Loading branch information
solsson authored Mar 1, 2019
2 parents 031ba69 + 1417ae0 commit 1d4945b
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion avro-tools/test/rest-curl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
spec:
containers:
- name: topic-create
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- ./bin/kafka-topics.sh
- --zookeeper
Expand Down
2 changes: 1 addition & 1 deletion cruise-control/topic-create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: topic-create
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- ./bin/kafka-topics.sh
- --zookeeper
Expand Down
2 changes: 1 addition & 1 deletion kafka/50kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
mountPath: /opt/kafka/libs/extensions
containers:
- name: broker
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: CLASSPATH
value: /opt/kafka/libs/extensions/*
Expand Down
2 changes: 1 addition & 1 deletion kafka/test/kafkacat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
spec:
containers:
- name: topic-create
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- ./bin/kafka-topics.sh
- --zookeeper
Expand Down
6 changes: 3 additions & 3 deletions kafka/test/produce-consume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
spec:
containers:
- name: topic-create
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- ./bin/kafka-topics.sh
- --zookeeper
Expand Down Expand Up @@ -99,7 +99,7 @@ spec:
spec:
containers:
- name: producer
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: BOOTSTRAP
value: bootstrap.kafka:9092
Expand Down Expand Up @@ -127,7 +127,7 @@ spec:
- name: shared
mountPath: /shared
- name: consumer
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: BOOTSTRAP
value: bootstrap.kafka:9092
Expand Down
2 changes: 1 addition & 1 deletion maintenance/preferred-replica-election-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kafka
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- ./bin/kafka-preferred-replica-election.sh
- --zookeeper
Expand Down
2 changes: 1 addition & 1 deletion maintenance/reassign-paritions-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kafka
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: ZOOKEEPER
value: zookeeper.kafka:2181
Expand Down
2 changes: 1 addition & 1 deletion maintenance/replication-factor-increase-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kafka
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: ZOOKEEPER
value: zookeeper.kafka:2181
Expand Down
2 changes: 1 addition & 1 deletion maintenance/test/replicated-partitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: kafka
image: solsson/kafka:1.0.1@sha256:1a4689d49d6274ac59b9b740f51b0408e1c90a9b66d16ad114ee9f7193bab111
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
command:
- /bin/bash
- -ec
Expand Down
2 changes: 1 addition & 1 deletion update-kafka-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ IMAGE=$1

[[ $IMAGE != solsson/kafka:* ]] && echo "Should be the full image identifier" && exit 1

for F in kafka/ kafka/test/ zookeeper/ avro-tools/test/ maintenance/; do
for F in kafka/ kafka/test/ zookeeper/ avro-tools/test/ maintenance/ cruise-control/ maintenance/test/; do
sed -i "s|image: solsson/kafka:.*|image: $IMAGE|" $F*.yml
done
2 changes: 1 addition & 1 deletion zookeeper/50pzoo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
mountPath: /var/lib/zookeeper
containers:
- name: zookeeper
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: KAFKA_LOG4J_OPTS
value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties
Expand Down
2 changes: 1 addition & 1 deletion zookeeper/51zoo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
mountPath: /var/lib/zookeeper
containers:
- name: zookeeper
image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
image: solsson/kafka:2.1.1@sha256:8bc8242c649c395ab79d76cc83b1052e63b4efea7f83547bf11eb3ef5ea6f8e1
env:
- name: KAFKA_LOG4J_OPTS
value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties
Expand Down

0 comments on commit 1d4945b

Please sign in to comment.