From 03d874f55b022e2fe1838b48605ef197f865c57e Mon Sep 17 00:00:00 2001 From: lvyongxin Date: Mon, 16 Mar 2020 16:29:32 +0800 Subject: [PATCH] update --- README.md | 14 ++++++++++++++ charts/zookeeper/values.yaml | 10 +++++----- templates/configmap.yaml | 6 +++--- templates/ingress.yaml | 20 ++++++++++++++++++++ templates/nimbus-deployment.yaml | 4 ++-- templates/supervisor-deployment.yaml | 4 ++-- templates/ui-deployment.yaml | 4 ++-- values-overrides.yaml | 8 ++++++-- 8 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 templates/ingress.yaml diff --git a/README.md b/README.md index 5209bb0..75ac8f7 100644 --- a/README.md +++ b/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 diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml index b1822f0..346fa89 100644 --- a/charts/zookeeper/values.yaml +++ b/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 diff --git a/templates/configmap.yaml b/templates/configmap.yaml index 22a3db9..c89173c 100644 --- a/templates/configmap.yaml +++ b/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" . }} diff --git a/templates/ingress.yaml b/templates/ingress.yaml new file mode 100644 index 0000000..562c64c --- /dev/null +++ b/templates/ingress.yaml @@ -0,0 +1,20 @@ +{{- 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 -}} diff --git a/templates/nimbus-deployment.yaml b/templates/nimbus-deployment.yaml index 01003f1..e3d22ab 100644 --- a/templates/nimbus-deployment.yaml +++ b/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 }}" diff --git a/templates/supervisor-deployment.yaml b/templates/supervisor-deployment.yaml index bfcab4b..87bdbda 100644 --- a/templates/supervisor-deployment.yaml +++ b/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;"] diff --git a/templates/ui-deployment.yaml b/templates/ui-deployment.yaml index aeaf01d..146ac16 100644 --- a/templates/ui-deployment.yaml +++ b/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;"] diff --git a/values-overrides.yaml b/values-overrides.yaml index e9d78be..1f3d582 100644 --- a/values-overrides.yaml +++ b/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 -- 2.26.0