Skip to content

Bug 1957015: [on-prem] Backport duplicate VIP fixes #2566

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

Merged
openshift-merge-robot merged 2 commits into from
May 6, 2021
Merged

Bug 1957015: [on-prem] Backport duplicate VIP fixes #2566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85164f
Cleanup keepalived vips before starting service
cybertron Apr 1, 2021
a893cee
On-Prem - fix vip filtering syntax for Keepalived remove-vips
yboaron Apr 27, 2021
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
16 changes: 15 additions & 1 deletion templates/common/on-prem/files/keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,21 @@ contents:
done
}

remove_vip()
{
address=$1
interface=$(ip -o a | awk "/\s${address}\// {print \$2}")
cidr=$(ip -o a | awk "/\s${address}\// {print \$4}")
if [ -n "$interface" ]; then
ip a del $cidr dev $interface
fi
}

set -ex
# Ensure that we don't have stale VIPs configured
# See https://bugzilla.redhat.com/show_bug.cgi?id=1931505
remove_vip "{{ onPremPlatformAPIServerInternalIP . }}"
remove_vip "{{ onPremPlatformIngressIP . }}"
declare -r keepalived_sock="/var/run/keepalived/keepalived.sock"
export -f msg_handler
export -f reload_keepalived
Expand Down Expand Up @@ -158,4 +172,4 @@ contents:
- operator: Exists
priorityClassName: system-node-critical
status: {}
{{ end -}}
{{ end -}}