WIP three node cluster without PetSet

20broker-service.yml

@@ -0,0 +1,36 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: broker-0
+  namespace: kafka
+spec:
+  selector:
+    app: kafka
+    petindex: "0"
+  ports:
+    - port: 9092
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: broker-1
+  namespace: kafka
+spec:
+  selector:
+    app: kafka
+    petindex: "1"
+  ports:
+    - port: 9092
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: broker-2
+  namespace: kafka
+spec:
+  selector:
+    app: kafka
+    petindex: "2"
+  ports:
+    - port: 9092

50kafka.yml

@@ -1,40 +1,38 @@
-apiVersion: apps/v1alpha1
-kind: PetSet
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: kafka
+  name: kafka-0
   namespace: kafka
 spec:
-  serviceName: "broker"
-  replicas: 3
+  replicas: 1
+  strategy:
+      type: Recreate
   template:
     metadata:
       labels:
         app: kafka
-      annotations:
-        pod.alpha.kubernetes.io/initialized: "true"
-        pod.alpha.kubernetes.io/init-containers: '[
-        ]'
+        petindex: "0"
     spec:
       containers:
       - name: broker
-        image: solsson/kafka-persistent:0.10.1
+        image: solsson/kafka-persistent:0.10.1@sha256:110f9e866acd4fb9e059b45884c34a210b2f40d6e2f8afe98ded616f43b599f9
+        #resources:
+        #  requests:
+        #    cpu: 100m
+        #    memory: 100Mi
         ports:
-        - containerPort: 9092
+          - containerPort: 9092
         command:
-        - sh
-        - -c
-        - "./bin/kafka-server-start.sh config/server.properties --override broker.id=$(hostname | awk -F'-' '{print $2}')"
+          - ./bin/kafka-server-start.sh
+          - config/server.properties
+          - --override
+          - broker.id=0
+          - --override
+          - advertised.listeners=PLAINTEXT://broker-0.kafka.svc.cluster.local:9092
         volumeMounts:
+          - name: datadir
+            mountPath: /opt/kafka/data
+      volumes:
         - name: datadir
-          mountPath: /opt/kafka/data
-  volumeClaimTemplates:
-  - metadata:
-      name: datadir
-      namespace: kafka
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      resources:
-        requests:
-          storage: 100Mi
+          persistentVolumeClaim:
+            claimName: datadir-kafka-0

51kafka.yml

@@ -0,0 +1,38 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: kafka-1
+  namespace: kafka
+spec:
+  replicas: 1
+  strategy:
+      type: Recreate
+  template:
+    metadata:
+      labels:
+        app: kafka
+        petindex: "1"
+    spec:
+      containers:
+      - name: broker
+        image: solsson/kafka-persistent:0.10.1@sha256:110f9e866acd4fb9e059b45884c34a210b2f40d6e2f8afe98ded616f43b599f9
+        #resources:
+        #  requests:
+        #    cpu: 100m
+        #    memory: 100Mi
+        ports:
+          - containerPort: 9092
+        command:
+          - ./bin/kafka-server-start.sh
+          - config/server.properties
+          - --override
+          - broker.id=1
+          - --override
+          - advertised.listeners=PLAINTEXT://broker-1.kafka.svc.cluster.local:9092
+        volumeMounts:
+          - name: datadir
+            mountPath: /opt/kafka/data
+      volumes:
+        - name: datadir
+          persistentVolumeClaim:
+            claimName: datadir-kafka-1

52kafka.yml

@@ -0,0 +1,38 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: kafka-2
+  namespace: kafka
+spec:
+  replicas: 1
+  strategy:
+      type: Recreate
+  template:
+    metadata:
+      labels:
+        app: kafka
+        petindex: "2"
+    spec:
+      containers:
+      - name: broker
+        image: solsson/kafka-persistent:0.10.1@sha256:110f9e866acd4fb9e059b45884c34a210b2f40d6e2f8afe98ded616f43b599f9
+        #resources:
+        #  requests:
+        #    cpu: 100m
+        #    memory: 100Mi
+        ports:
+          - containerPort: 9092
+        command:
+          - ./bin/kafka-server-start.sh
+          - config/server.properties
+          - --override
+          - broker.id=2
+          - --override
+          - advertised.listeners=PLAINTEXT://broker-2.kafka.svc.cluster.local:9092
+        volumeMounts:
+          - name: datadir
+            mountPath: /opt/kafka/data
+      volumes:
+        - name: datadir
+          persistentVolumeClaim:
+            claimName: datadir-kafka-2

README.md

@@ -30,17 +30,21 @@ The volume size in the example is very small. The numbers don't really matter as
 
 ## Set up Zookeeper
 
-This module contains a copy of `pets/zookeeper/` from https://github.com/kubernetes/contrib.
+With [nopetset](https://github.com/Yolean/kubernetes-kafka/pull/9) we also discarded persistent storage, so there is no zookeeper bootstrap or [README](https://github.com/Yolean/kubernetes-kafka/blob/master/zookeeper/README.md). Just run:
 
-See the `./zookeeper` folder and follow the README there.
-
-An additional service has been added here, create using:
 ```
-kubectl create -f ./zookeeper/service.yml
+kubectl create -f ./zookeeper/
 ```
 
 ## Start Kafka
 
+Set up persistent volumes:
+```
+./bootstrap/pv.sh
+kubectl create -f bootstrap/pvc.yml
+```
+
+Set up kafka:
 ```
 kubectl create -f ./
 ```

test/test.sh

@@ -10,10 +10,13 @@ kubectl exec -ti testclient -- ./bin/kafka-console-consumer.sh --zookeeper zooke
 
 # Go ahead and produce messages
 echo "Write a message followed by enter, exit using Ctrl+C"
-kubectl exec -ti testclient -- ./bin/kafka-console-producer.sh --broker-list kafka-0.broker.kafka.svc.cluster.local:9092 --topic test1
+kubectl exec -ti testclient -- ./bin/kafka-console-producer.sh --broker-list broker-0.kafka.svc.cluster.local:9092 --topic test1
 
-# Bootstrap even if two nodes are down (shorter name requires same namespace)
-kubectl exec -ti testclient -- ./bin/kafka-console-producer.sh --broker-list kafka-0.broker:9092,kafka-1.broker:9092,kafka-2.broker:9092 --topic test1
+# Bootstrap even if two nodes are down
+kubectl exec -ti testclient -- ./bin/kafka-console-producer.sh --broker-list broker-0.kafka.svc.cluster.local:9092,broker-1.kafka.svc.cluster.local:9092,broker-2.kafka.svc.cluster.local:9092 --topic test1
+
+# Get a broker through the service
+kubectl exec -ti testclient -- ./bin/kafka-console-producer.sh --broker-list kafka.kafka.svc.cluster.local:9092 --topic test1
 
 # The following commands run in the pod
 kubectl exec -ti testclient -- /bin/bash
@@ -22,13 +25,13 @@ kubectl exec -ti testclient -- /bin/bash
 ./bin/kafka-topics.sh --zookeeper zookeeper:2181 --describe --topic test2
 
 ./bin/kafka-verifiable-consumer.sh \
-  --broker-list=kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092 \
+  --broker-list=kafka.kafka.svc.cluster.local:9092 \
   --topic=test2 --group-id=A --verbose
 
 # If a topic isn't available this producer will tell you
 # WARN Error while fetching metadata with correlation id X : {topicname=LEADER_NOT_AVAILABLE}
 # ... but with current config Kafka will auto-create the topic
 ./bin/kafka-verifiable-producer.sh \
-  --broker-list=kafka-0.broker.kafka.svc.cluster.local:9092,kafka-1.broker.kafka.svc.cluster.local:9092 \
+  --broker-list=kafka.kafka.svc.cluster.local:9092 \
   --value-prefix=1 --topic=test2 \
   --acks=1 --throughput=1 --max-messages=10

zookeeper/00namespace.yml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kafka

zookeeper/20zoo-service.yml

@@ -0,0 +1,85 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: zoo-0
+  namespace: kafka
+spec:
+  selector:
+    app: zookeeper
+    petindex: "0"
+  ports:
+    - port: 2888
+      name: peer
+    - port: 3888
+      name: leader-election
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: zoo-1
+  namespace: kafka
+spec:
+  selector:
+    app: zookeeper
+    petindex: "1"
+  ports:
+    - port: 2888
+      name: peer
+    - port: 3888
+      name: leader-election
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: zoo-2
+  namespace: kafka
+spec:
+  selector:
+    app: zookeeper
+    petindex: "2"
+  ports:
+    - port: 2888
+      name: peer
+    - port: 3888
+      name: leader-election
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: zoo-3
+  namespace: kafka
+spec:
+  selector:
+    app: zookeeper
+    petindex: "3"
+  ports:
+    - port: 2888
+      name: peer
+    - port: 3888
+      name: leader-election
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: zoo-4
+  namespace: kafka
+spec:
+  selector:
+    app: zookeeper
+    petindex: "4"
+  ports:
+    - port: 2888
+      name: peer
+    - port: 3888
+      name: leader-election

zookeeper/service.yml → zookeeper/30service.yml

@@ -9,4 +9,4 @@ spec:
   - port: 2181
     name: client
   selector:
-    app: zk
+    app: zookeeper

zookeeper/50zoo.yml

@@ -0,0 +1,38 @@
+apiVersion: extensions/v1beta1
+kind: ReplicaSet
+metadata:
+  name: zoo-0
+  namespace: kafka
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: zookeeper
+        petindex: "0"
+    spec:
+      containers:
+        - name: zookeeper
+          image: zookeeper@sha256:bb1a12a2168fc5e508ee019aea2d45bf846e99ea87d6bcaf2ede5c59fd439368
+          env:
+            - name: ZOO_MY_ID
+              value: "1"
+            - name: ZOO_SERVERS
+              value: server.1=0.0.0.0:2888:3888:participant server.2=zoo-1.kafka.svc.cluster.local:2888:3888:participant server.3=zoo-2.kafka.svc.cluster.local:2888:3888:participant server.4=zoo-3.kafka.svc.cluster.local:2888:3888:participant server.5=zoo-4.kafka.svc.cluster.local:2888:3888:participant
+          ports:
+            - containerPort: 2181
+              name: client
+            - containerPort: 2888
+              name: peer
+            - containerPort: 3888
+              name: leader-election
+          volumeMounts:
+            - name: datadir
+              mountPath: /tmp/zookeeper
+            - name: opt
+              mountPath: /opt/
+      volumes:
+        - name: opt
+          emptyDir: {}
+        - name: datadir
+          emptyDir: {}