From e4687d4da210e2deff4a65fff1c250b61e829296 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Mon, 17 Aug 2020 10:56:04 +0200 Subject: [PATCH 1/6] Update dev-small variant's images to the 2.6.0 build --- native/native-image-zookeeper.yaml | 4 ++-- nonroot/nonroot-image-kafka.yaml | 4 ++-- nonroot/nonroot-image-zookeeper.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/native/native-image-zookeeper.yaml b/native/native-image-zookeeper.yaml index 5d38e65d..483f87f4 100644 --- a/native/native-image-zookeeper.yaml +++ b/native/native-image-zookeeper.yaml @@ -7,7 +7,7 @@ spec: spec: containers: - name: zookeeper - image: solsson/kafka:native-zookeeper-server-start@sha256:ba3a0632240b8906a3b5bb6441e98ad9d9de73cb716b156ca68f1b435c819e8b + image: solsson/kafka:native-zookeeper-server-start@sha256:eade61d60bb59005d06c8edd6dfebd7f18437e09cc5516916b50096cfbdb1ffe resources: requests: cpu: 10m @@ -22,7 +22,7 @@ spec: spec: containers: - name: zookeeper - image: solsson/kafka:native-zookeeper-server-start@sha256:ba3a0632240b8906a3b5bb6441e98ad9d9de73cb716b156ca68f1b435c819e8b + image: solsson/kafka:native-zookeeper-server-start@sha256:eade61d60bb59005d06c8edd6dfebd7f18437e09cc5516916b50096cfbdb1ffe resources: requests: cpu: 10m diff --git a/nonroot/nonroot-image-kafka.yaml b/nonroot/nonroot-image-kafka.yaml index 9bfb41f3..58d9545b 100644 --- a/nonroot/nonroot-image-kafka.yaml +++ b/nonroot/nonroot-image-kafka.yaml @@ -7,9 +7,9 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:initutils-nonroot@sha256:87f6bb39fd47a6f382018a2dc55a484d1b71eee48a58019c7e65a9bc53e8dca2 + image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 containers: - name: broker - image: solsson/kafka:2.5.0-kafka-server-start@sha256:c6d43d1240c358d9ab8bb60de61a0b9578f04fd727ee4016f7706800998e5351 + image: solsson/kafka:2.6.0-kafka-server-start@sha256:97623a66ed7a245af8e12947d99f723d983fbfc83cae4f60febc0526235e1548 args: - /etc/kafka/server.properties.$(POD_NAME) diff --git a/nonroot/nonroot-image-zookeeper.yaml b/nonroot/nonroot-image-zookeeper.yaml index 8db695a9..de36fa08 100644 --- a/nonroot/nonroot-image-zookeeper.yaml +++ b/nonroot/nonroot-image-zookeeper.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:initutils-nonroot@sha256:87f6bb39fd47a6f382018a2dc55a484d1b71eee48a58019c7e65a9bc53e8dca2 + image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 containers: - name: zookeeper image: solsson/kafka:zookeeper-server-start@sha256:c34a9928fcc5ac15b2243ee2994cf09f5a3608b6090de378f39f89ad12320276 @@ -23,7 +23,7 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:initutils-nonroot@sha256:87f6bb39fd47a6f382018a2dc55a484d1b71eee48a58019c7e65a9bc53e8dca2 + image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 containers: - name: zookeeper image: solsson/kafka:zookeeper-server-start@sha256:c34a9928fcc5ac15b2243ee2994cf09f5a3608b6090de378f39f89ad12320276 From ec402e7540413727e26db30d2a95944bf49794e9 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Mon, 17 Aug 2020 12:13:07 +0200 Subject: [PATCH 2/6] Now the scale-2 and scale 3-5 variants also run builds from 2.6.0 --- nonroot/nonroot-image-zookeeper.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonroot/nonroot-image-zookeeper.yaml b/nonroot/nonroot-image-zookeeper.yaml index de36fa08..5ad41018 100644 --- a/nonroot/nonroot-image-zookeeper.yaml +++ b/nonroot/nonroot-image-zookeeper.yaml @@ -10,7 +10,7 @@ spec: image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 containers: - name: zookeeper - image: solsson/kafka:zookeeper-server-start@sha256:c34a9928fcc5ac15b2243ee2994cf09f5a3608b6090de378f39f89ad12320276 + image: solsson/kafka:2.6.0-zookeeper-server-start@sha256:9406e3c810254dfb2fddac951756a3f44d1036a0c476ff49e8055c8d465f5083 args: - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME) --- @@ -26,6 +26,6 @@ spec: image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 containers: - name: zookeeper - image: solsson/kafka:zookeeper-server-start@sha256:c34a9928fcc5ac15b2243ee2994cf09f5a3608b6090de378f39f89ad12320276 + image: solsson/kafka:2.6.0-zookeeper-server-start@sha256:9406e3c810254dfb2fddac951756a3f44d1036a0c476ff49e8055c8d465f5083 args: - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME) From fb6695890ed6fd3e29161698ca5e9464033fddfb Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Thu, 22 Apr 2021 15:16:28 +0200 Subject: [PATCH 3/6] Kafka 2.8.0 --- nonroot/nonroot-image-kafka.yaml | 4 ++-- nonroot/nonroot-image-zookeeper.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nonroot/nonroot-image-kafka.yaml b/nonroot/nonroot-image-kafka.yaml index 58d9545b..292b21fa 100644 --- a/nonroot/nonroot-image-kafka.yaml +++ b/nonroot/nonroot-image-kafka.yaml @@ -7,9 +7,9 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 + image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9 containers: - name: broker - image: solsson/kafka:2.6.0-kafka-server-start@sha256:97623a66ed7a245af8e12947d99f723d983fbfc83cae4f60febc0526235e1548 + image: solsson/kafka:2.8.0-kafka-server-start@sha256:825a7e70563a786a43c327f06257c3c502f8bc191d4fb91cf53fdc07aa69703f args: - /etc/kafka/server.properties.$(POD_NAME) diff --git a/nonroot/nonroot-image-zookeeper.yaml b/nonroot/nonroot-image-zookeeper.yaml index 5ad41018..eceb7353 100644 --- a/nonroot/nonroot-image-zookeeper.yaml +++ b/nonroot/nonroot-image-zookeeper.yaml @@ -7,10 +7,10 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 + image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9 containers: - name: zookeeper - image: solsson/kafka:2.6.0-zookeeper-server-start@sha256:9406e3c810254dfb2fddac951756a3f44d1036a0c476ff49e8055c8d465f5083 + image: solsson/kafka:2.8.0-zookeeper-server-start@sha256:88da70e37b878f5a6edfb3de206f7155b430c605cf956735741d5a011a10b7e9 args: - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME) --- @@ -23,9 +23,9 @@ spec: spec: initContainers: - name: init-config - image: solsson/kafka:2.6.0-initutils-nonroot@sha256:cae9390de5380a4a1cd88976b37161ecf32fd70cde347a1db458b17ffa7743b8 + image: solsson/kafka:initutils-nonroot@sha256:c239d8c5c767cfe9ffd81cce96af9a61e487400d167f58a7e89478c958ca73b9 containers: - name: zookeeper - image: solsson/kafka:2.6.0-zookeeper-server-start@sha256:9406e3c810254dfb2fddac951756a3f44d1036a0c476ff49e8055c8d465f5083 + image: solsson/kafka:2.8.0-zookeeper-server-start@sha256:88da70e37b878f5a6edfb3de206f7155b430c605cf956735741d5a011a10b7e9 args: - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME) From 551afeed9d1b65fbe5e54a3b1c39eb3a89e85d1e Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sat, 24 Apr 2021 06:13:36 +0200 Subject: [PATCH 4/6] We only use nonroot variants, but root is kept for compatibility with existing persistent volumes. Zookeeper is 3.5.9, which fixes #341. --- kafka/50kafka.yml | 4 ++-- zookeeper/50pzoo.yml | 4 ++-- zookeeper/51zoo.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml index a001f1d5..e5b8e510 100644 --- a/kafka/50kafka.yml +++ b/kafka/50kafka.yml @@ -21,7 +21,7 @@ spec: terminationGracePeriodSeconds: 30 initContainers: - name: init-config - image: solsson/kafka:initutils@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c + image: solsson/kafka:initutils@sha256:0cd27e24dea0b27e17e72cd05259a4de394d527473c6707e89f26b87e356a04d env: - name: NODE_NAME valueFrom: @@ -45,7 +45,7 @@ spec: mountPath: /opt/kafka/libs/extensions containers: - name: broker - image: solsson/kafka:2.5.1@sha256:5c52620bd8e1bcd47805eb8ca285843168e1684aa27f1ae11ce330c3e12f6b0c + image: solsson/kafka:2.8.0@sha256:69274245ad16fba37e5b277335502a02e41c0efeae3ccbc3374f6cf624b58347 env: - name: POD_NAME valueFrom: diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index cdaae36b..e18875a0 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -23,7 +23,7 @@ spec: terminationGracePeriodSeconds: 10 initContainers: - name: init-config - image: solsson/kafka:initutils@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c + image: solsson/kafka:initutils@sha256:0cd27e24dea0b27e17e72cd05259a4de394d527473c6707e89f26b87e356a04d command: ['/bin/bash', '/etc/kafka-configmap/init.sh'] env: - name: POD_NAME @@ -43,7 +43,7 @@ spec: mountPath: /var/lib/zookeeper containers: - name: zookeeper - image: solsson/kafka:2.5.1@sha256:5c52620bd8e1bcd47805eb8ca285843168e1684aa27f1ae11ce330c3e12f6b0c + image: solsson/kafka:2.8.0@sha256:69274245ad16fba37e5b277335502a02e41c0efeae3ccbc3374f6cf624b58347 env: - name: POD_NAME valueFrom: diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index 52e930f7..5b475967 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -23,7 +23,7 @@ spec: terminationGracePeriodSeconds: 10 initContainers: - name: init-config - image: solsson/kafka:initutils@sha256:8988aca5b34feabe8d7d4e368f74b2ede398f692c7e99a38b262a938d475812c + image: solsson/kafka:initutils@sha256:0cd27e24dea0b27e17e72cd05259a4de394d527473c6707e89f26b87e356a04d command: ['/bin/bash', '/etc/kafka-configmap/init.sh'] env: - name: POD_NAME @@ -45,7 +45,7 @@ spec: mountPath: /var/lib/zookeeper containers: - name: zookeeper - image: solsson/kafka:2.5.1@sha256:5c52620bd8e1bcd47805eb8ca285843168e1684aa27f1ae11ce330c3e12f6b0c + image: solsson/kafka:2.8.0@sha256:69274245ad16fba37e5b277335502a02e41c0efeae3ccbc3374f6cf624b58347 env: - name: POD_NAME valueFrom: From 9ac0060eaaed5ab3cf9385049a8926679baadc23 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Sun, 27 Jun 2021 11:07:12 +0200 Subject: [PATCH 5/6] Removes namespace for compatibility with kustomize v4+, but not yet from RBAC or kustomize patches --- avro-tools/avro-tools-config.yml | 1 - avro-tools/rest-service.yml | 1 - avro-tools/rest.yml | 1 - avro-tools/schemas-service.yml | 1 - avro-tools/schemas.yml | 1 - avro-tools/test/70rest-test1.yml | 1 - consumers-prometheus/kminion-service.yaml | 1 - consumers-prometheus/kminion.yaml | 1 - cruise-control/11cruise-control-config.yml | 1 - cruise-control/20kafka-broker-reporter-patch.yml | 1 - cruise-control/40cruise-control-service.yml | 1 - cruise-control/50cruise-control.yml | 1 - cruise-control/topic-create.yml | 1 - events-kube/topic-create.yaml | 1 - kafka/10broker-config.yml | 1 - kafka/20dns.yml | 1 - kafka/30bootstrap-service.yml | 1 - kafka/50kafka.yml | 1 - linkedin-burrow/burrow-config.yml | 1 - linkedin-burrow/burrow-service.yml | 1 - linkedin-burrow/burrow.yml | 1 - maintenance/preferred-replica-election-job.yml | 1 - maintenance/reassign-paritions-job.yml | 1 - maintenance/replication-factor-increase-job.yml | 1 - outside-services/outside-0.yml | 1 - outside-services/outside-1.yml | 1 - outside-services/outside-2.yml | 1 - pixy/pixy-service.yml | 1 - pixy/pixy.yml | 1 - prometheus/10-metrics-config.yml | 1 - prometheus/50-kafka-jmx-exporter-patch.yml | 1 - rbac-namespace-default/pod-labler.yml | 2 -- variants/aks-managed/volume-claims.yaml | 2 -- variants/aws-gp2/volume-claims.yaml | 2 -- variants/dev-small/jmx-disable.yaml | 1 - variants/gke-regional/volume-claims.yaml | 3 --- variants/prometheus-operator-example/k8s-kafka-rbac.yaml | 2 -- .../prometheus-operator-example/k8s-kafka-servicemonitor.yaml | 1 - variants/scale-1-ephemeral/kafka.yaml | 1 - variants/scale-1-ephemeral/zookeeper.yaml | 3 --- variants/scale-1/kafka.yaml | 1 - variants/scale-1/zookeeper.yaml | 3 --- variants/scale-2/kafka.yaml | 1 - variants/scale-2/zookeeper.yaml | 2 -- variants/scale-3-3/only-zoo-3.yaml | 2 -- variants/scale-3-5-nopzoo/only-zoo-5.yaml | 2 -- variants/scale-6-9/zoo-9.yaml | 2 -- yahoo-kafka-manager/kafka-manager-service.yml | 1 - yahoo-kafka-manager/kafka-manager.yml | 1 - zookeeper/10zookeeper-config.yml | 1 - zookeeper/20pzoo-service.yml | 1 - zookeeper/21zoo-service.yml | 1 - zookeeper/30service.yml | 1 - zookeeper/50pzoo.yml | 1 - zookeeper/51zoo.yml | 1 - 55 files changed, 69 deletions(-) diff --git a/avro-tools/avro-tools-config.yml b/avro-tools/avro-tools-config.yml index 5f5d3425..b9e5b88c 100644 --- a/avro-tools/avro-tools-config.yml +++ b/avro-tools/avro-tools-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: avro-tools-config - namespace: kafka apiVersion: v1 data: schema-registry.properties: |- diff --git a/avro-tools/rest-service.yml b/avro-tools/rest-service.yml index bf683a32..01a4056a 100644 --- a/avro-tools/rest-service.yml +++ b/avro-tools/rest-service.yml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: avro-rest - namespace: kafka spec: ports: - port: 80 diff --git a/avro-tools/rest.yml b/avro-tools/rest.yml index 1f02cefe..fadbf12f 100644 --- a/avro-tools/rest.yml +++ b/avro-tools/rest.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: avro-rest - namespace: kafka spec: replicas: 1 selector: diff --git a/avro-tools/schemas-service.yml b/avro-tools/schemas-service.yml index 9a9cd4e9..06ed169c 100644 --- a/avro-tools/schemas-service.yml +++ b/avro-tools/schemas-service.yml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: avro-schemas - namespace: kafka spec: ports: - port: 80 diff --git a/avro-tools/schemas.yml b/avro-tools/schemas.yml index 964f988e..76a5ee1e 100644 --- a/avro-tools/schemas.yml +++ b/avro-tools/schemas.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: avro-schemas - namespace: kafka spec: replicas: 1 selector: diff --git a/avro-tools/test/70rest-test1.yml b/avro-tools/test/70rest-test1.yml index f26cdc96..a3bc1309 100644 --- a/avro-tools/test/70rest-test1.yml +++ b/avro-tools/test/70rest-test1.yml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: rest-test1 - namespace: kafka spec: backoffLimit: 1 template: diff --git a/consumers-prometheus/kminion-service.yaml b/consumers-prometheus/kminion-service.yaml index 04bb8d9f..7d296b3c 100644 --- a/consumers-prometheus/kminion-service.yaml +++ b/consumers-prometheus/kminion-service.yaml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: kminion - namespace: kafka labels: &labels app: kminion spec: diff --git a/consumers-prometheus/kminion.yaml b/consumers-prometheus/kminion.yaml index 51d3f5fb..96c8bb28 100644 --- a/consumers-prometheus/kminion.yaml +++ b/consumers-prometheus/kminion.yaml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kminion - namespace: kafka labels: &labels app: kminion spec: diff --git a/cruise-control/11cruise-control-config.yml b/cruise-control/11cruise-control-config.yml index b964d199..a71a7a85 100644 --- a/cruise-control/11cruise-control-config.yml +++ b/cruise-control/11cruise-control-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: broker-cruise-control-config - namespace: kafka apiVersion: v1 data: cruisecontrol.properties: |- diff --git a/cruise-control/20kafka-broker-reporter-patch.yml b/cruise-control/20kafka-broker-reporter-patch.yml index f3305ecd..77973dff 100644 --- a/cruise-control/20kafka-broker-reporter-patch.yml +++ b/cruise-control/20kafka-broker-reporter-patch.yml @@ -2,7 +2,6 @@ # kubectl --namespace kafka patch statefulset kafka --patch "$(cat cruise-control/20kafka-broker-reporter-patch.yml)" metadata: name: kafka - namespace: kafka spec: template: spec: diff --git a/cruise-control/40cruise-control-service.yml b/cruise-control/40cruise-control-service.yml index dcb8f243..d1dd4691 100644 --- a/cruise-control/40cruise-control-service.yml +++ b/cruise-control/40cruise-control-service.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: cruise-control - namespace: kafka spec: selector: app: cruise-control diff --git a/cruise-control/50cruise-control.yml b/cruise-control/50cruise-control.yml index d2892b8c..07360300 100644 --- a/cruise-control/50cruise-control.yml +++ b/cruise-control/50cruise-control.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: cruise-control - namespace: kafka spec: selector: matchLabels: diff --git a/cruise-control/topic-create.yml b/cruise-control/topic-create.yml index c8730c15..ad8e93a3 100644 --- a/cruise-control/topic-create.yml +++ b/cruise-control/topic-create.yml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: topic-cruise-control-metrics - namespace: kafka spec: template: spec: diff --git a/events-kube/topic-create.yaml b/events-kube/topic-create.yaml index 2cf4f062..cffbfb33 100644 --- a/events-kube/topic-create.yaml +++ b/events-kube/topic-create.yaml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: topic-create-event-kube - namespace: kafka spec: template: spec: diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml index 78cc7337..2635aae3 100644 --- a/kafka/10broker-config.yml +++ b/kafka/10broker-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: broker-config - namespace: kafka apiVersion: v1 data: init.sh: |- diff --git a/kafka/20dns.yml b/kafka/20dns.yml index 3a74b708..4de5d6ee 100644 --- a/kafka/20dns.yml +++ b/kafka/20dns.yml @@ -4,7 +4,6 @@ apiVersion: v1 kind: Service metadata: name: kafka - namespace: kafka annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: diff --git a/kafka/30bootstrap-service.yml b/kafka/30bootstrap-service.yml index 7c2a3376..4c0b8c10 100644 --- a/kafka/30bootstrap-service.yml +++ b/kafka/30bootstrap-service.yml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Service metadata: name: bootstrap - namespace: kafka spec: ports: - port: 9092 diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml index e5b8e510..a877f709 100644 --- a/kafka/50kafka.yml +++ b/kafka/50kafka.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: selector: matchLabels: diff --git a/linkedin-burrow/burrow-config.yml b/linkedin-burrow/burrow-config.yml index 5fe6dda1..836f86ca 100644 --- a/linkedin-burrow/burrow-config.yml +++ b/linkedin-burrow/burrow-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: burrow-config - namespace: kafka apiVersion: v1 data: burrow.toml: |- diff --git a/linkedin-burrow/burrow-service.yml b/linkedin-burrow/burrow-service.yml index 15eac06a..9d1a41ad 100644 --- a/linkedin-burrow/burrow-service.yml +++ b/linkedin-burrow/burrow-service.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: burrow - namespace: kafka spec: selector: app: burrow diff --git a/linkedin-burrow/burrow.yml b/linkedin-burrow/burrow.yml index 465811bb..35f45bbd 100644 --- a/linkedin-burrow/burrow.yml +++ b/linkedin-burrow/burrow.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: burrow - namespace: kafka spec: replicas: 1 selector: diff --git a/maintenance/preferred-replica-election-job.yml b/maintenance/preferred-replica-election-job.yml index be1dd1b6..1de26ece 100644 --- a/maintenance/preferred-replica-election-job.yml +++ b/maintenance/preferred-replica-election-job.yml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: preferred-replica-election - namespace: kafka spec: template: metadata: diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml index d70df63e..c5ac72d1 100644 --- a/maintenance/reassign-paritions-job.yml +++ b/maintenance/reassign-paritions-job.yml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: reassign-partitions - namespace: kafka spec: template: metadata: diff --git a/maintenance/replication-factor-increase-job.yml b/maintenance/replication-factor-increase-job.yml index b46c4e15..d0faf863 100644 --- a/maintenance/replication-factor-increase-job.yml +++ b/maintenance/replication-factor-increase-job.yml @@ -2,7 +2,6 @@ apiVersion: batch/v1 kind: Job metadata: name: replication-factor-increase - namespace: kafka spec: template: metadata: diff --git a/outside-services/outside-0.yml b/outside-services/outside-0.yml index 7bc12bd7..58c63439 100644 --- a/outside-services/outside-0.yml +++ b/outside-services/outside-0.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: outside-0 - namespace: kafka spec: selector: app: kafka diff --git a/outside-services/outside-1.yml b/outside-services/outside-1.yml index 1642ee02..b48b7bfd 100644 --- a/outside-services/outside-1.yml +++ b/outside-services/outside-1.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: outside-1 - namespace: kafka spec: selector: app: kafka diff --git a/outside-services/outside-2.yml b/outside-services/outside-2.yml index 78c313cc..180c6b77 100644 --- a/outside-services/outside-2.yml +++ b/outside-services/outside-2.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: outside-2 - namespace: kafka spec: selector: app: kafka diff --git a/pixy/pixy-service.yml b/pixy/pixy-service.yml index c15b7379..606f2efe 100644 --- a/pixy/pixy-service.yml +++ b/pixy/pixy-service.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: pixy - namespace: kafka spec: selector: app: pixy diff --git a/pixy/pixy.yml b/pixy/pixy.yml index 190195b4..eb3cbc20 100644 --- a/pixy/pixy.yml +++ b/pixy/pixy.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pixy - namespace: kafka labels: app: pixy spec: diff --git a/prometheus/10-metrics-config.yml b/prometheus/10-metrics-config.yml index 345e1929..c09e4fe9 100644 --- a/prometheus/10-metrics-config.yml +++ b/prometheus/10-metrics-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: jmx-config - namespace: kafka apiVersion: v1 data: diff --git a/prometheus/50-kafka-jmx-exporter-patch.yml b/prometheus/50-kafka-jmx-exporter-patch.yml index 13b10181..b3c16b47 100644 --- a/prometheus/50-kafka-jmx-exporter-patch.yml +++ b/prometheus/50-kafka-jmx-exporter-patch.yml @@ -4,7 +4,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: template: metadata: diff --git a/rbac-namespace-default/pod-labler.yml b/rbac-namespace-default/pod-labler.yml index bd488b00..c95e06aa 100644 --- a/rbac-namespace-default/pod-labler.yml +++ b/rbac-namespace-default/pod-labler.yml @@ -9,7 +9,6 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: pod-labler - namespace: kafka labels: origin: github.com_Yolean_kubernetes-kafka rules: @@ -26,7 +25,6 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: kafka-pod-labler - namespace: kafka labels: origin: github.com_Yolean_kubernetes-kafka roleRef: diff --git a/variants/aks-managed/volume-claims.yaml b/variants/aks-managed/volume-claims.yaml index fb20db89..8e88e2c1 100644 --- a/variants/aks-managed/volume-claims.yaml +++ b/variants/aks-managed/volume-claims.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: volumeClaimTemplates: - metadata: @@ -19,7 +18,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: volumeClaimTemplates: - metadata: diff --git a/variants/aws-gp2/volume-claims.yaml b/variants/aws-gp2/volume-claims.yaml index fb20db89..8e88e2c1 100644 --- a/variants/aws-gp2/volume-claims.yaml +++ b/variants/aws-gp2/volume-claims.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: volumeClaimTemplates: - metadata: @@ -19,7 +18,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: volumeClaimTemplates: - metadata: diff --git a/variants/dev-small/jmx-disable.yaml b/variants/dev-small/jmx-disable.yaml index fb7dd092..5a5c0dfd 100644 --- a/variants/dev-small/jmx-disable.yaml +++ b/variants/dev-small/jmx-disable.yaml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: template: spec: diff --git a/variants/gke-regional/volume-claims.yaml b/variants/gke-regional/volume-claims.yaml index 42357194..8af95734 100644 --- a/variants/gke-regional/volume-claims.yaml +++ b/variants/gke-regional/volume-claims.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: volumeClaimTemplates: - metadata: @@ -19,7 +18,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: volumeClaimTemplates: - metadata: @@ -35,7 +33,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: volumeClaimTemplates: - metadata: diff --git a/variants/prometheus-operator-example/k8s-kafka-rbac.yaml b/variants/prometheus-operator-example/k8s-kafka-rbac.yaml index 311961ce..450c156d 100644 --- a/variants/prometheus-operator-example/k8s-kafka-rbac.yaml +++ b/variants/prometheus-operator-example/k8s-kafka-rbac.yaml @@ -4,7 +4,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: prometheus-k8s - namespace: kafka rules: - apiGroups: - "" @@ -21,7 +20,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: prometheus-k8s - namespace: kafka roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/variants/prometheus-operator-example/k8s-kafka-servicemonitor.yaml b/variants/prometheus-operator-example/k8s-kafka-servicemonitor.yaml index 35b5b416..b006c2e6 100644 --- a/variants/prometheus-operator-example/k8s-kafka-servicemonitor.yaml +++ b/variants/prometheus-operator-example/k8s-kafka-servicemonitor.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Service metadata: name: broker-monitoring - namespace: kafka labels: app: kafka spec: diff --git a/variants/scale-1-ephemeral/kafka.yaml b/variants/scale-1-ephemeral/kafka.yaml index 436fa722..91197fc0 100644 --- a/variants/scale-1-ephemeral/kafka.yaml +++ b/variants/scale-1-ephemeral/kafka.yaml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: template: spec: diff --git a/variants/scale-1-ephemeral/zookeeper.yaml b/variants/scale-1-ephemeral/zookeeper.yaml index c2810703..5c7f85a7 100644 --- a/variants/scale-1-ephemeral/zookeeper.yaml +++ b/variants/scale-1-ephemeral/zookeeper.yaml @@ -3,13 +3,11 @@ apiVersion: v1 kind: Service metadata: name: pzoo - namespace: kafka --- apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: template: spec: @@ -22,7 +20,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: template: spec: diff --git a/variants/scale-1/kafka.yaml b/variants/scale-1/kafka.yaml index 18d01c80..f91f4f18 100644 --- a/variants/scale-1/kafka.yaml +++ b/variants/scale-1/kafka.yaml @@ -2,6 +2,5 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: replicas: 1 diff --git a/variants/scale-1/zookeeper.yaml b/variants/scale-1/zookeeper.yaml index ae027b0b..24235d8e 100644 --- a/variants/scale-1/zookeeper.yaml +++ b/variants/scale-1/zookeeper.yaml @@ -3,13 +3,11 @@ apiVersion: v1 kind: Service metadata: name: pzoo - namespace: kafka --- apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: replicas: 0 --- @@ -17,7 +15,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: replicas: 1 template: diff --git a/variants/scale-2/kafka.yaml b/variants/scale-2/kafka.yaml index c80e25a9..d3be3cb4 100644 --- a/variants/scale-2/kafka.yaml +++ b/variants/scale-2/kafka.yaml @@ -2,6 +2,5 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: kafka - namespace: kafka spec: replicas: 2 diff --git a/variants/scale-2/zookeeper.yaml b/variants/scale-2/zookeeper.yaml index 96c8b189..6bbbdc36 100644 --- a/variants/scale-2/zookeeper.yaml +++ b/variants/scale-2/zookeeper.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: replicas: 0 --- @@ -11,7 +10,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: replicas: 2 template: diff --git a/variants/scale-3-3/only-zoo-3.yaml b/variants/scale-3-3/only-zoo-3.yaml index bced2320..0f3251d2 100644 --- a/variants/scale-3-3/only-zoo-3.yaml +++ b/variants/scale-3-3/only-zoo-3.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: replicas: 0 --- @@ -11,7 +10,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: replicas: 3 template: diff --git a/variants/scale-3-5-nopzoo/only-zoo-5.yaml b/variants/scale-3-5-nopzoo/only-zoo-5.yaml index ed59e8de..8d070cce 100644 --- a/variants/scale-3-5-nopzoo/only-zoo-5.yaml +++ b/variants/scale-3-5-nopzoo/only-zoo-5.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: replicas: 0 --- @@ -11,7 +10,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: replicas: 5 template: diff --git a/variants/scale-6-9/zoo-9.yaml b/variants/scale-6-9/zoo-9.yaml index e2babff0..88732508 100644 --- a/variants/scale-6-9/zoo-9.yaml +++ b/variants/scale-6-9/zoo-9.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: replicas: 0 --- @@ -11,7 +10,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: replicas: 9 template: diff --git a/yahoo-kafka-manager/kafka-manager-service.yml b/yahoo-kafka-manager/kafka-manager-service.yml index 3d26adf3..1666217d 100644 --- a/yahoo-kafka-manager/kafka-manager-service.yml +++ b/yahoo-kafka-manager/kafka-manager-service.yml @@ -2,7 +2,6 @@ kind: Service apiVersion: v1 metadata: name: kafka-manager - namespace: kafka spec: selector: app: kafka-manager diff --git a/yahoo-kafka-manager/kafka-manager.yml b/yahoo-kafka-manager/kafka-manager.yml index 16eea0b0..bcb4d281 100644 --- a/yahoo-kafka-manager/kafka-manager.yml +++ b/yahoo-kafka-manager/kafka-manager.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kafka-manager - namespace: kafka spec: replicas: 1 selector: diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml index 57728474..a962664a 100644 --- a/zookeeper/10zookeeper-config.yml +++ b/zookeeper/10zookeeper-config.yml @@ -1,7 +1,6 @@ kind: ConfigMap metadata: name: zookeeper-config - namespace: kafka apiVersion: v1 data: init.sh: |- diff --git a/zookeeper/20pzoo-service.yml b/zookeeper/20pzoo-service.yml index 00c33e1c..6eba722a 100644 --- a/zookeeper/20pzoo-service.yml +++ b/zookeeper/20pzoo-service.yml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: pzoo - namespace: kafka spec: ports: - port: 2888 diff --git a/zookeeper/21zoo-service.yml b/zookeeper/21zoo-service.yml index 53beaeb7..f3861af2 100644 --- a/zookeeper/21zoo-service.yml +++ b/zookeeper/21zoo-service.yml @@ -2,7 +2,6 @@ apiVersion: v1 kind: Service metadata: name: zoo - namespace: kafka spec: ports: - port: 2888 diff --git a/zookeeper/30service.yml b/zookeeper/30service.yml index f33f3938..f1e52650 100644 --- a/zookeeper/30service.yml +++ b/zookeeper/30service.yml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Service metadata: name: zookeeper - namespace: kafka spec: ports: - port: 2181 diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index e18875a0..434c5094 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: pzoo - namespace: kafka spec: selector: matchLabels: diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index 5b475967..e6a82e57 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -2,7 +2,6 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: zoo - namespace: kafka spec: selector: matchLabels: From 27944d98beaa41732c177bd3700f03fbe1e56c6c Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Mon, 16 Aug 2021 09:29:11 +0200 Subject: [PATCH 6/6] Looks like Kustomize doesn't bail when a patch fails to match a resource --- variants/dev-small/kustomization.yaml | 2 -- variants/scale-1/kustomization.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/variants/dev-small/kustomization.yaml b/variants/dev-small/kustomization.yaml index a22670a3..af3a4195 100644 --- a/variants/dev-small/kustomization.yaml +++ b/variants/dev-small/kustomization.yaml @@ -9,12 +9,10 @@ patchesJson6902: version: v1 kind: StatefulSet name: kafka - namespace: kafka path: listener-localhost.json - target: group: apps version: v1 kind: StatefulSet name: kafka - namespace: kafka path: num-partitions-1.json diff --git a/variants/scale-1/kustomization.yaml b/variants/scale-1/kustomization.yaml index ab741e0b..7ea89636 100644 --- a/variants/scale-1/kustomization.yaml +++ b/variants/scale-1/kustomization.yaml @@ -9,5 +9,4 @@ patchesJson6902: version: v1 kind: StatefulSet name: kafka - namespace: kafka path: kafka-scale1-overrides.json