Merge pull request #314 from redpanda-data/fix_313_post_start_fail

Fix postStart.sh hook with custom Service domain (kubeadm's network.dnsDomain)
redpanda-data · Feb 7, 2023 · d4a7c50 · d4a7c50
2 parents 6b932f9 + 4f1adc2
commit d4a7c50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 2.8.0
+version: 2.8.1
 
 # The app version is the default version of Redpanda to install.
 appVersion: v22.3.10

diff --git a/charts/redpanda/templates/secrets.yaml b/charts/redpanda/templates/secrets.yaml
@@ -33,7 +33,7 @@ stringData:
     #!/usr/bin/env bash
 
     # the SERVICE_NAME comes from the metadata.name of the pod, essentially the POD_NAME
-    CURL_URL="{{ include "admin-http-protocol" . }}://${SERVICE_NAME}.{{ template "redpanda.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.listeners.admin.port }}"
+    CURL_URL="{{ include "admin-http-protocol" . }}://${SERVICE_NAME}.{{ template "redpanda.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | trimSuffix "." }}:{{ .Values.listeners.admin.port }}"
 
     # commands used throughout
     CURL_NODE_ID_CMD="curl --silent --fail {{ include "admin-tls-curl-flags" . }} ${CURL_URL}/v1/node_config"

diff --git a/charts/redpanda/templates/tests/test-kafka-produce-consume.yaml b/charts/redpanda/templates/tests/test-kafka-produce-consume.yaml
@@ -48,7 +48,7 @@ spec:
           image: {{ .Values.image.repository}}:{{ template "redpanda.tag" . }}
           env:
             - name: REDPANDA_BROKERS
-              value: "{{ include "redpanda.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.listeners.kafka.port }}"
+              value: "{{ include "redpanda.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | trimSuffix "." }}:{{ .Values.listeners.kafka.port }}"
             - name: POD_NAME
               valueFrom:
                 fieldRef: