From 1901b512d285d153f091ef8352ac4b54d0e72975 Mon Sep 17 00:00:00 2001
From: Wouter Goedhart <mail@woutergoedhart.nl>
Date: Mon, 24 Oct 2022 03:00:24 +0200
Subject: [PATCH] Make the port of kube-vip dynamic based on the
kube_apiserver_port (#9414)
variable
Fix wrong referenced variable on bgp_peers
Fix bgp_peeras field to be a string
Set default value for bgp_peeras
---
roles/kubernetes/node/defaults/main.yml | 2 +-
.../node/templates/manifests/kube-vip.manifest.j2 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index e90008c68..69a89ab4b 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -77,7 +77,7 @@ kube_vip_bgp_routerid:
kube_vip_local_as: 65000
kube_vip_bgp_peeraddress:
kube_vip_bgp_peerpass:
-kube_vip_bgp_peeras:
+kube_vip_bgp_peeras: 65000
kube_vip_bgppeers:
kube_vip_address:
diff --git a/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2
index d6789b156..2ca073f52 100644
--- a/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2
@@ -13,7 +13,7 @@ spec:
- name: vip_arp
value: {{ kube_vip_arp_enabled | string | to_json }}
- name: port
- value: "6443"
+ value: {{ kube_apiserver_port | string | to_json }}
{% if kube_vip_interface %}
- name: vip_interface
value: {{ kube_vip_interface | string | to_json }}
@@ -60,10 +60,10 @@ spec:
- name: bgp_peerpass
value: {{ kube_vip_bgp_peerpass | to_json }}
- name: bgp_peeras
- value: {{ kube_vip_bgp_peeras | to_json }}
+ value: {{ kube_vip_bgp_peeras | string | to_json }}
{% if kube_vip_bgppeers %}
- name: bgp_peers
- value: {{ kube_vip_bgp_peeras | join(',') | to_json }}
+ value: {{ kube_vip_bgppeers | join(',') | to_json }}
{% endif %}
{% endif %}
- name: address
--
GitLab