Skip to content

Commit d5cbba6

Browse files
author
Kazuhiko Yamashita
authored
fix: When set to controller only, port 9092 is not listened on (#1218)
1 parent e0a2e81 commit d5cbba6

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Diff for: sentry/templates/_helper.tpl

+11
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,17 @@ Set Kafka Confluent port
410410
{{- end -}}
411411
{{- end -}}
412412

413+
{{/*
414+
Set Kafka Confluent Controller port
415+
*/}}
416+
{{- define "sentry.kafka.controller_port" -}}
417+
{{- if and (.Values.kafka.enabled) (.Values.kafka.service.ports.controller ) -}}
418+
{{- .Values.kafka.service.ports.controller }}
419+
{{- else if and (.Values.externalKafka) (not (kindIs "slice" .Values.externalKafka)) -}}
420+
{{ required "A valid .Values.externalKafka.port is required" .Values.externalKafka.port }}
421+
{{- end -}}
422+
{{- end -}}
423+
413424
{{/*
414425
Set Kafka bootstrap servers string
415426
*/}}

Diff for: sentry/templates/hooks/sentry-db-check.job.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{{- $clickhousePort := include "sentry.clickhouse.port" . -}}
44
{{- $kafkaHost := include "sentry.kafka.host" . -}}
55
{{- $kafkaPort := include "sentry.kafka.port" . -}}
6+
{{- $kafkaControllerPort := include "sentry.kafka.controller_port" . -}}
67
apiVersion: batch/v1
78
kind: Job
89
metadata:
@@ -140,7 +141,7 @@ spec:
140141
KRAFT_STATUS=1
141142
i=0; while [ $i -lt $KAFKA_REPLICAS ]; do
142143
KRAFT_HOST={{ $kafkaHost }}-controller-$i.{{ $kafkaHost }}-controller-headless
143-
if ! nc -z "$KRAFT_HOST" {{ $kafkaPort }}; then
144+
if ! nc -z "$KRAFT_HOST" {{ $kafkaControllerPort }}; then
144145
KRAFT_STATUS=0
145146
echo "$KRAFT_HOST is not available yet"
146147
fi

0 commit comments

Comments
 (0)