Merge branch 'master' into nonroot-entrypoints

solsson · solsson · commit 4207d2064a72 · 2020-07-12T07:05:11.000+02:00
diff --git 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:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
diff --git a/consumers-prometheus/kafka-minion.yaml b/consumers-prometheus/kafka-minion.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: kafka-minion
-        image: solsson/kafka-consumers-prometheus@sha256:b5f5b8672397f94379a5a3e8b4bf41cf12b64ff1c4fc7f84684edca4beb37c16
+        image: solsson/kafka-consumers-prometheus@sha256:4fb3e8bd5e70f14cbb9168d3259f7a7b601a1cf9af29f88ad239bc5d7e43ee30
         env:
         - name: TELEMETRY_HOST
           value: 0.0.0.0
diff --git a/cruise-control/topic-create.yml b/cruise-control/topic-create.yml
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka-cli@sha256:9fa3306e9f5d18283d10e01f7c115d8321eedc682f262aff784bd0126e1f2221
+        image: solsson/kafka:native-cli@sha256:7a4cc4ef875aea50b8d4dbb525cbac0ef3a5c6e611fcafc2c415ca432ebe5601
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
@@ -17,10 +17,6 @@ spec:
         - --if-not-exists
         - --topic
         -   __CruiseControlMetrics
-        - --partitions
-        -   '12'
-        - --replication-factor
-        -   '3'
         resources:
           limits:
             cpu: 100m
diff --git a/events-kube/topic-create.yaml b/events-kube/topic-create.yaml
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
+        image: solsson/kafka:native-cli@sha256:7a4cc4ef875aea50b8d4dbb525cbac0ef3a5c6e611fcafc2c415ca432ebe5601
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
@@ -17,12 +17,8 @@ spec:
         - --if-not-exists
         - --topic
         -   ops.kube-events.stream.json
-        - --partitions
-        -   "12"
-        - --replication-factor
-        -   "2"
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: 100m
+            memory: 20Mi
       restartPolicy: Never
diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
@@ -45,7 +45,7 @@ spec:
           mountPath: /opt/kafka/libs/extensions
       containers:
       - name: broker
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: POD_NAME
           valueFrom:
diff --git a/kafka/test/kafkacat.yml b/kafka/test/kafkacat.yml
@@ -72,7 +72,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka-cli@sha256:9fa3306e9f5d18283d10e01f7c115d8321eedc682f262aff784bd0126e1f2221
+        image: solsson/kafka:native-cli@sha256:7a4cc4ef875aea50b8d4dbb525cbac0ef3a5c6e611fcafc2c415ca432ebe5601
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
@@ -83,8 +83,8 @@ spec:
         -   test-kafkacat
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: 100m
+            memory: 20Mi
       restartPolicy: Never
 ---
 apiVersion: apps/v1
diff --git 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-cli@sha256:9fa3306e9f5d18283d10e01f7c115d8321eedc682f262aff784bd0126e1f2221
+        image: solsson/kafka:native-cli@sha256:7a4cc4ef875aea50b8d4dbb525cbac0ef3a5c6e611fcafc2c415ca432ebe5601
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
@@ -64,14 +64,10 @@ spec:
         - --if-not-exists
         - --topic
         -   test-produce-consume
-        - --partitions
-        -   "3"
-        - --replication-factor
-        -   "2"
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: 100m
+            memory: 20Mi
       restartPolicy: Never
 ---
 apiVersion: apps/v1
@@ -99,7 +95,7 @@ spec:
     spec:
       containers:
       - name: producer
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
@@ -127,7 +123,7 @@ spec:
         - name: shared
           mountPath: /shared
       - name: consumer
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
diff --git 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:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         command:
         - ./bin/kafka-preferred-replica-election.sh
         - --zookeeper
diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git 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:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/test/replicated-partitions.yml b/maintenance/test/replicated-partitions.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         command:
         - /bin/bash
         - -ec
diff --git a/yahoo-kafka-manager/Kustomization b/yahoo-kafka-manager/Kustomization
@@ -0,0 +1,3 @@
+resources:
+- kafka-manager-service.yml
+- kafka-manager.yml
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
@@ -39,7 +39,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: POD_NAME
           valueFrom:
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
@@ -41,7 +41,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
+        image: solsson/kafka:2.4.1@sha256:79761e15919b4fe9857ec00313c9df799918ad0340b684c0163ab7035907bb5a
         env:
         - name: POD_NAME
           valueFrom:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+resources:`
	`2`	`+- kafka-manager-service.yml`
	`3`	`+- kafka-manager.yml`