Skip to content

sentinel: don't announce-ip 0.0.0.0 when using hostname discovery #1750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SAY-5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sentinel: don't announce-ip 0.0.0.0 when using hostname discovery #1750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions internal/agent/bootstrap/sentinel/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,16 @@ func GenerateConfig() error {
cfg.Append("sentinel myid", sentinelID)
}

// If resolveHostnames is set to yes, then we need to announce the hostnames
if announceHostnames == "yes" && resolveHostnames == "yes" {
// When announceHostnames=yes + resolveHostnames=yes, peer
// discovery is expected to go through DNS, not IP. The
// previous behaviour here wrote `sentinel announce-ip <ip>`
// with whatever IP env var happened to hold - in practice the
// operator never sets IP, so the default "0.0.0.0" wound up
// in sentinel.conf and Sentinels could not find each other
// (#1748). Emit an announce-ip only when we actually have a
// concrete IP to announce (i.e. the operator has set IP), and
// rely on announce-hostnames + resolve-hostnames otherwise.
if announceHostnames == "yes" && resolveHostnames == "yes" && ip != "" && ip != "0.0.0.0" {
cfg.Append("sentinel announce-ip", ip)
}
}
Expand Down