From 734f3e524a9564840284ca199b5e3cf724373fd3 Mon Sep 17 00:00:00 2001 From: Johannes Liebermann Date: Fri, 18 Sep 2020 17:16:01 +0200 Subject: [PATCH] components/metallb: Add missing autodiscovery labels In order to allow users to control all supported BGP parameters by specifying labels in worker pool config, we need to specify mappings for them. Fixes #987. --- pkg/components/metallb/component_test.go | 4 ++++ pkg/components/metallb/manifests.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkg/components/metallb/component_test.go b/pkg/components/metallb/component_test.go index 30643ca43..b898b92a3 100644 --- a/pkg/components/metallb/component_test.go +++ b/pkg/components/metallb/component_test.go @@ -265,6 +265,10 @@ component "metallb" { my-asn: metallb.lokomotive.io/my-asn peer-asn: metallb.lokomotive.io/peer-asn peer-address: metallb.lokomotive.io/peer-address + peer-port: metallb.lokomotive.io/peer-port + src-address: metallb.lokomotive.io/src-address + hold-time: metallb.lokomotive.io/hold-time + router-id: metallb.lokomotive.io/router-id address-pools: - name: default protocol: bgp diff --git a/pkg/components/metallb/manifests.go b/pkg/components/metallb/manifests.go index 941eb19e7..e71127d8d 100644 --- a/pkg/components/metallb/manifests.go +++ b/pkg/components/metallb/manifests.go @@ -516,6 +516,10 @@ data: my-asn: metallb.lokomotive.io/my-asn peer-asn: metallb.lokomotive.io/peer-asn peer-address: metallb.lokomotive.io/peer-address + peer-port: metallb.lokomotive.io/peer-port + src-address: metallb.lokomotive.io/src-address + hold-time: metallb.lokomotive.io/hold-time + router-id: metallb.lokomotive.io/router-id address-pools: {{- range $k, $v := .AddressPools }} - name: {{ $k }}