openstack/openstack-helm-infra
Code Issues Proposed changes

Basic support for BGP communities in calico

Browse Source 
This creates a new section in calico/values.yaml that enables
BGP communities to be applied to a cidr by using the bird_ipam
templates.

Change-Id: I4dbbc8d8e761e0484eeb7c8bf0fefa28d29493e5
This commit is contained in:
Michael Beaver 2019-01-08 13:32:11 -06:00
parent 2a3740f349
commit e34270c51e
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calico/templates/bird/_bird6_ipam.cfg.template.tpl
View File

@ -8,7 +8,23 @@ function osh_filters ()
{{- end }} {{- end }}
} }
function apply_communities ()
{
# Set community value based on dictionary of cidrs
{{- $asnum := .Values.networking.bgp.asnumber }}
{{- range .Values.networking.bgp.ipv6.community_cidr_ref }}
{{- $community := .community }}
{{- $cidr := .cidr }}
{{- with .prefix }}
if ( net ~ {{ $cidr }} ) then { bgp_community.add(({{ . }}, {{ $community }})); }
{{- else }}
if ( net ~ {{ $cidr }} ) then { bgp_community.add(({{ $asnum }}, {{ $community }})); }
{{- end }}
{{- end }}
}
filter calico_pools { filter calico_pools {
apply_communities();
calico_aggr(); calico_aggr();
osh_filters(); osh_filters();
{{`{{range ls "/pool"}}{{$data := json (getv (printf "/pool/%s" .))}}`}} {{`{{range ls "/pool"}}{{$data := json (getv (printf "/pool/%s" .))}}`}}

16
calico/templates/bird/_bird_ipam.cfg.template.tpl
View File

@ -8,7 +8,23 @@ function osh_filters ()
{{- end }} {{- end }}
} }
function apply_communities ()
{
# Set community value based on dictionary of cidrs
{{- $asnum := .Values.networking.bgp.asnumber }}
{{- range .Values.networking.bgp.ipv4.community_cidr_ref }}
{{- $community := .community }}
{{- $cidr := .cidr }}
{{- with .prefix }}
if ( net ~ {{ $cidr }} ) then { bgp_community.add(({{ . }}, {{ $community }})); }
{{- else }}
if ( net ~ {{ $cidr }} ) then { bgp_community.add(({{ $asnum }}, {{ $community }})); }
{{- end }}
{{- end }}
}
filter calico_pools { filter calico_pools {
apply_communities();
calico_aggr(); calico_aggr();
osh_filters(); osh_filters();
{{`{{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}}`}} {{`{{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}}`}}

30
calico/values.yaml
View File

@ -224,6 +224,21 @@ networking:
# IPs within them on a host, we will announce the address in # IPs within them on a host, we will announce the address in
# addition to traditional pod workloads # addition to traditional pod workloads
additional_cidrs: [] additional_cidrs: []
# community_cidr_ref contains embedded objects that describe a
# BGP community that is to be associated with the supplied CIDR.
# The top-level key names are not important.
#
# The resulting BGP community will take the form of
# <prefix>:<community>
# If no prefix is specified then the asnumber is used
community_cidr_ref:
# cidr_community_description:
# cidr: 192.168.0.0/16
# community: 54321
# prefix: 55555
# alpha:
# cidr: 10.0.0.0/16
# community: 54322
port: port:
neighbor: 179 neighbor: 179
listen: 179 listen: 179
@ -247,6 +262,21 @@ networking:
# IPs within them on a host, we will announce them in addition # IPs within them on a host, we will announce them in addition
# to traditional pod workloads # to traditional pod workloads
additional_cidrs: [] additional_cidrs: []
# community_cidr_ref contains embedded objects that describe a
# BGP community that is to be associated with the supplied CIDR.
# The top-level key names are not important.
#
# The resulting BGP community will take the form of
# <prefix>:<community>
# If no prefix is specified then the asnumber is used
community_cidr_ref:
# cidr_community_description:
# cidr: 2600:1:2:3::abcd/28
# community: 54321
# prefix: 55555
# alpha:
# cidr: 1400:a:2:3::abcd/26
# community: 54322
port: port:
neighbor: 179 neighbor: 179
listen: 179 listen: 179