Skip to content

Commit

Permalink
[PLAT-15344] Fix POD_IP resolution for MCS cases in server.conf file
Browse files Browse the repository at this point in the history
Summary:
(POD_IP) does not resolve in server.conf file, modified to {POD_IP}. Foudn this while
testing an MCS case.

Test Plan: Manually tested the POD_IP is resolving correctly now.

Reviewers: anijhawan

Reviewed By: anijhawan

Subscribers: anabaria, yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D38118
  • Loading branch information
kv83821-yb committed Sep 18, 2024
1 parent 19be56f commit 48d16a1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions stable/yugabyte/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@ Generate server broadcast address.
{{/*
Generate server RPC bind address.
In case of multi-cluster services (MCS), we set it to $(POD_IP) to
In case of multi-cluster services (MCS), we set it to ${POD_IP} to
ensure YCQL uses a resolvable address.
See https://github.com/yugabyte/yugabyte-db/issues/16155

We use a workaround for above in case of Istio by setting it to
$(POD_IP) and localhost. Master doesn't support that combination, so
${POD_IP} and localhost. Master doesn't support that combination, so
we stick to 0.0.0.0, which works for master.
*/}}
{{- define "yugabyte.rpc_bind_address" -}}
Expand All @@ -327,10 +327,10 @@ we stick to 0.0.0.0, which works for master.
{{- if (eq .Service.name "yb-masters") -}}
0.0.0.0:{{ $port }}
{{- else -}}
$(POD_IP):{{ $port }},127.0.0.1:{{ $port }}
${POD_IP}:{{ $port }},127.0.0.1:{{ $port }}
{{- end -}}
{{- else if (or .Values.multicluster.createServiceExports .Values.multicluster.createServicePerPod) -}}
$(POD_IP):{{ $port }}
${POD_IP}:{{ $port }}
{{- else -}}
{{- include "yugabyte.server_fqdn" . -}}
{{- end -}}
Expand Down

0 comments on commit 48d16a1

Please sign in to comment.