Merge pull request #12 from Cryptophobia/master

Add stateless nsqd cluster support and update to nsq:v1.2.0

Author: Cryptophobia

charts/nsqd/templates/nsqd-pdb.yaml

@@ -0,0 +1,9 @@
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: deis-nsqd
+spec:
+  minAvailable: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: deis-nsqd

charts/nsqd/templates/nsqd-deployment.yaml charts/nsqd/templates/nsqd-statefulset.yaml

@@ -1,13 +1,13 @@
 apiVersion: {{ template "APIVersion" . }}
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: deis-nsqd
   labels:
     heritage: deis
   annotations:
     component.deis.io/version: {{ .Values.docker_tag }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas }}
   strategy:
     type: Recreate
   selector:

charts/nsqd/templates/nsqd-svc.yaml

@@ -6,11 +6,12 @@ metadata:
     heritage: deis
     app: deis-nsqd
 spec:
+  clusterIP: None
   ports:
-  - port: 4151
+  - port: {{ .Values.http_port }}
     name: http
     targetPort: http
-  - port: 4150
+  - port: {{ .Values.tcp_port }}
     name: transport
     targetPort: transport
   selector:

charts/nsqd/values.yaml

@@ -3,3 +3,6 @@ pull_policy: "Always"
 docker_tag: "canary"
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
+replicas: 1
+tcp_port: 4150
+http_port: 4151

rootfs/Dockerfile

@@ -1,4 +1,4 @@
-FROM nsqio/nsq:v1.1.0
+FROM nsqio/nsq:v1.2.0
 
 RUN mkdir -p /opt/nsq/data \
     && adduser \

rootfs/opt/nsq/bin/start-nsqd

@@ -1,5 +1,4 @@
 #!/bin/sh
-set -eo pipefail
 
 export CONFIG_PATH=${CONFIG_PATH:-/opt/nsq/conf/nsqd.cfg}
 exec nsqd -config "${CONFIG_PATH}"

rootfs/opt/nsq/conf/nsqd.cfg

@@ -1,9 +1,9 @@
 ## log verbosity level: debug, info, warn, error, or fatal
-log_level = "warn"
+log-level = "warn"
 verbose = false
 
 ## path to store disk-backed messages
 data_path = "/opt/nsq/data"
 
 ## maximum RDY count for a client
-max_rdy_count = 10000
+max_rdy_count = 10000