From 9022c9237d32c2dc69e4a24aafac9a40610043b6 Mon Sep 17 00:00:00 2001 From: SIRI KIM Date: Wed, 5 Jun 2019 05:14:07 +0000 Subject: [PATCH] Ingress: add keepalived-router-id for keeplived vip When there are multiple keepalived instances in same network space, equal keepalived router-ids cause conflict (now default router-id number is 100). So we have to specify keepalived's router_id for VRRP peering. This commit make keepalived route-id configurable, so that we can prevent keepalived conflict caused by default keepalived router-id. Change-Id: Ia92a8b64205ab52ad15237e9fdeaacb61aae6400 --- ingress/templates/deployment-ingress.yaml | 2 ++ ingress/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 0c2a4d5b1..087a3d421 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -338,6 +338,8 @@ spec: value: {{ ( .Values.network.vip.addr | split "/" )._0 | quote }} - name: KEEPALIVED_UNICAST_PEERS value: null + - name: KEEPALIVED_ROUTER_ID + value: {{ .Values.network.vip.keepalived_router_id | quote }} {{- end }} {{- end }} volumes: diff --git a/ingress/values.yaml b/ingress/values.yaml index 844fd4302..3346a766f 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -140,6 +140,7 @@ network: mode: routed interface: ingress-vip addr: 172.18.0.1/32 + keepalived_router_id: 100 ingress: annotations: #NOTE(portdirect): if left blank this is populated from