From b42bf39fb7286a138a8b5f3b2eed3c458055c4ea Mon Sep 17 00:00:00 2001
From: Maciej <m.wereski@partner.samsung.com>
Date: Wed, 3 Feb 2021 10:02:28 +0100
Subject: [PATCH] MetalLB: bump to v0.9.5 (#7241)
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---
inventory/sample/group_vars/k8s-cluster/addons.yml | 2 +-
roles/kubernetes-apps/metallb/defaults/main.yml | 2 +-
roles/kubernetes-apps/metallb/templates/metallb.yml.j2 | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inventory/sample/group_vars/k8s-cluster/addons.yml b/inventory/sample/group_vars/k8s-cluster/addons.yml
index 32a86e4a5..42e9fdea6 100644
--- a/inventory/sample/group_vars/k8s-cluster/addons.yml
+++ b/inventory/sample/group_vars/k8s-cluster/addons.yml
@@ -132,7 +132,7 @@ cert_manager_enabled: false
metallb_enabled: false
# metallb_ip_range:
# - "10.5.0.50-10.5.0.99"
-# metallb_version: v0.9.3
+# metallb_version: v0.9.5
# metallb_protocol: "layer2"
# metallb_port: "7472"
# metallb_limits_cpu: "100m"
diff --git a/roles/kubernetes-apps/metallb/defaults/main.yml b/roles/kubernetes-apps/metallb/defaults/main.yml
index 716cb2b6a..ae26ba3e1 100644
--- a/roles/kubernetes-apps/metallb/defaults/main.yml
+++ b/roles/kubernetes-apps/metallb/defaults/main.yml
@@ -1,6 +1,6 @@
---
metallb_enabled: false
-metallb_version: v0.9.3
+metallb_version: v0.9.5
metallb_protocol: "layer2"
metallb_port: "7472"
metallb_limits_cpu: "100m"
diff --git a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2 b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
index 392c02137..4fe688365 100644
--- a/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
+++ b/roles/kubernetes-apps/metallb/templates/metallb.yml.j2
@@ -306,6 +306,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
+ # needed when another software is also using memberlist / port 7946
+ #- name: METALLB_ML_BIND_PORT
+ # value: "7946"
- name: METALLB_ML_LABELS
value: "app=metallb,component=speaker"
- name: METALLB_ML_NAMESPACE
--
GitLab