update

README.md

@@ -73,3 +73,17 @@ $ helm install --name my-release -f values.yaml incubator/storm
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
+
+# 1. Setup
+helm install \
+/etc/kubernetes/helm/storm \
+--name=storm \
+--namespace=cdh \
+-f /etc/kubernetes/helm/storm/values-overrides.yaml
+
+# 2. Upgrade
+helm upgrade storm /etc/kubernetes/helm/storm \
+-f /etc/kubernetes/helm/storm/values-overrides.yaml
+
+# 3. Uninstall
+helm del --purge storm

charts/zookeeper/values.yaml

@@ -211,7 +211,7 @@ exporters:
   ## - https://github.com/carlpett/zookeeper_exporter
   ## - https://hub.docker.com/r/josdotso/zookeeper-exporter/
   ## - https://www.datadoghq.com/blog/monitoring-kafka-performance-metrics/#zookeeper-metrics
-    enabled: false
+    enabled: true
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/zookeeper-exporter
       tag: v1.1.2
@@ -255,10 +255,10 @@ env:
 
   ## Options related to JMX exporter.
   ## ref: https://github.com/apache/zookeeper/blob/master/bin/zkServer.sh#L36
-  JMXAUTH: "false"
-  JMXDISABLE: "false"
+  JMXAUTH: "true"
+  JMXDISABLE: "true"
   JMXPORT: 1099
-  JMXSSL: "false"
+  JMXSSL: "true"
 
   ## The port on which the server will accept client requests.
   ZK_CLIENT_PORT: 2181
@@ -309,7 +309,7 @@ env:
 jobs:
   ## ref: http://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkSessions
   chroots:
-    enabled: false
+    enabled: true
     activeDeadlineSeconds: 300
     backoffLimit: 5
     completions: 1

templates/configmap.yaml

@@ -10,7 +10,7 @@ data:
   storm.yaml: |-
     ########### These MUST be filled in for a storm configuration
     storm.zookeeper.servers:
-        - {{ template "storm.zookeeper.fullname" . }}
+        - {{ .Values.zookeeper.service.name }}
     nimbus.seeds:
         - {{ template "storm.nimbus.fullname" . }}
     storm.local.hostname: {{ template "storm.nimbus.fullname" . }}
@@ -29,7 +29,7 @@ data:
   storm.yaml: |-
     ########### These MUST be filled in for a storm configuration
     storm.zookeeper.servers:
-        - {{ template "storm.zookeeper.fullname" . }}
+        - {{ .Values.zookeeper.service.name }}
     nimbus.seeds:
         - {{ template "storm.nimbus.fullname" . }}
     storm.local.hostname: {{ template "storm.supervisor.fullname" . }}
@@ -64,7 +64,7 @@ data:
   storm.yaml: |-
     ########### These MUST be filled in for a storm configuration
     storm.zookeeper.servers:
-        - {{ template "storm.zookeeper.fullname" . }}
+        - {{ .Values.zookeeper.service.name }}
     nimbus.seeds:
         - {{ template "storm.nimbus.fullname" . }}
     storm.local.hostname: {{ template "storm.ui.fullname" . }}

templates/ingress.yaml

+{{- if .Values.ingress.enabled -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "storm.ui.fullname" . }}
+  labels:
+    chart: {{ template "storm.chart" . }}
+    release: {{ .Release.Name }}
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  rules:
+  - host: "{{ .Values.ingress.host }}"
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: {{ .Release.Name }}-ui
+          servicePort: 8080
+{{- end -}}

templates/nimbus-deployment.yaml

@@ -22,9 +22,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
-      - name: init-{{ template "storm.zookeeper.fullname" . }}
+      - name: init-{{ template "storm.fullname" . }}-zookeeper
         image: busybox
-        command: ["sh", "-c", "until nslookup {{ template "storm.zookeeper.fullname" . }}; do echo waiting for {{ template "storm.zookeeper.fullname" . }}; sleep 2; done;"]
+        command: ["sh", "-c", "until nslookup {{ .Values.zookeeper.service.name }}; do echo waiting for {{ .Values.zookeeper.service.name }}; sleep 2; done;"]
       containers:
       - name: {{ .Values.nimbus.service.name }}
         image: "{{ .Values.nimbus.image.repository }}:{{ .Values.nimbus.image.tag }}"

templates/supervisor-deployment.yaml

@@ -20,9 +20,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
-      - name: init-{{ template "storm.zookeeper.fullname" . }}
+      - name: init-{{ template "storm.fullname" . }}-zookeeper
         image: busybox
-        command: ["sh", "-c", "until nslookup {{ template "storm.zookeeper.fullname" . }}; do echo waiting for {{ template "storm.zookeeper.fullname" . }}; sleep 2; done;"]
+        command: ["sh", "-c", "until nslookup {{ .Values.zookeeper.service.name }}; do echo waiting for {{ .Values.zookeeper.service.name }}; sleep 2; done;"]
       - name: init-{{ template "storm.nimbus.fullname" . }}
         image: busybox
         command: ["sh", "-c", "until nslookup {{ template "storm.nimbus.fullname" . }}; do echo waiting for {{ template "storm.nimbus.fullname" . }}; sleep 2; done;"]

templates/ui-deployment.yaml

@@ -23,9 +23,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
-      - name: init-{{ template "storm.zookeeper.fullname" . }}
+      - name: init-{{ template "storm.fullname" . }}-ui
         image: busybox
-        command: ["sh", "-c", "until nslookup {{ template "storm.zookeeper.fullname" . }}; do echo waiting for {{ template "storm.zookeeper.fullname" . }}; sleep 2; done;"]
+        command: ["sh", "-c", "until nslookup {{ .Values.zookeeper.service.name }}; do echo waiting for {{ .Values.zookeeper.service.name }}; sleep 2; done;"]
       - name: init-{{ template "storm.nimbus.fullname" . }}
         image: busybox
         command: ["sh", "-c", "until nslookup {{ template "storm.nimbus.fullname" . }}; do echo waiting for {{ template "storm.nimbus.fullname" . }}; sleep 2; done;"]

values-overrides.yaml

@@ -57,8 +57,12 @@ ui:
     annotations: {}
     tls: []
 
-zookeeper:
+ingress:
   enabled: true
+  host: storm-ui.wodcloud.com
+
+zookeeper:
+  enabled: false
   service:
-    name: zookeeper
+    name: myzk-zookeeper-headless
   stormName: storm