apache/pulsar-helm-chart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve Zookeeper "ruok" probes: use TLS port when TLS is enabled, specify "-q 1" for nc (#223)

Browse Source 
- NOTICE: we are no more using "bin/pulsar-zookeeper-ruok.sh" from the apachepulsar/pulsar docker image. The probe script is part of the chart.

* Pass "-q 1" to netcat (nc) to fix issue with Zookeeper ruok probe

- see https://github.com/apache/pulsar/pull/14088

* Send ruok to TLS port when TLS is enabled

* Bump chart version
This commit is contained in:
Lari Hotari 2022-02-17 07:48:20 +02:00 committed by GitHub
parent 5b90c5195c
commit 1c4f745941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/pulsar/Chart.yaml
View File

@ -21,7 +21,7 @@ apiVersion: v2
appVersion: "2.7.4"
description: Apache Pulsar Helm chart for Kubernetes
name: pulsar
version: 2.7.11
version: 2.7.12
home: https://pulsar.apache.org
sources:
- https://github.com/apache/pulsar

18
charts/pulsar/templates/zookeeper-statefulset.yaml
View File

@ -141,6 +141,12 @@ spec:
envFrom:
- configMapRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
{{- $zkConnectCommand := "" -}}
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
{{- $zkConnectCommand = print "openssl s_client -quiet -crlf -connect localhost:" .Values.zookeeper.ports.clientTls " -cert /pulsar/certs/zookeeper/tls.crt -key /pulsar/certs/zookeeper/tls.key" -}}
{{- else -}}
{{- $zkConnectCommand = print "nc -q 1 localhost " .Values.zookeeper.ports.client -}}
{{- end }}
{{- if .Values.zookeeper.probe.readiness.enabled }}
{{- if and .Values.rbac.enabled .Values.rbac.psp }}
securityContext:
@ -151,7 +157,9 @@ spec:
command:
- timeout
- "{{ .Values.zookeeper.probe.readiness.timeoutSeconds }}"
- bin/pulsar-zookeeper-ruok.sh
- bash
- -c
- 'echo ruok | {{ $zkConnectCommand }} | grep imok'
initialDelaySeconds: {{ .Values.zookeeper.probe.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.zookeeper.probe.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.zookeeper.probe.readiness.timeoutSeconds }}
@ -163,7 +171,9 @@ spec:
command:
- timeout
- "{{ .Values.zookeeper.probe.liveness.timeoutSeconds }}"
- bin/pulsar-zookeeper-ruok.sh
- bash
- -c
- 'echo ruok | {{ $zkConnectCommand }} | grep imok'
initialDelaySeconds: {{ .Values.zookeeper.probe.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.zookeeper.probe.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.zookeeper.probe.liveness.timeoutSeconds }}
@ -175,7 +185,9 @@ spec:
command:
- timeout
- "{{ .Values.zookeeper.probe.startup.timeoutSeconds }}"
- bin/pulsar-zookeeper-ruok.sh
- bash
- -c
- 'echo ruok | {{ $zkConnectCommand }} | grep imok'
initialDelaySeconds: {{ .Values.zookeeper.probe.startup.initialDelaySeconds }}
periodSeconds: {{ .Values.zookeeper.probe.startup.periodSeconds }}
timeoutSeconds: {{ .Values.zookeeper.probe.startup.timeoutSeconds }}