diff --git a/confd/etc/calico/confd/templates/bird6_ipam.cfg.template b/confd/etc/calico/confd/templates/bird6_ipam.cfg.template index fc65d01d3c2..fcfecba2f36 100644 --- a/confd/etc/calico/confd/templates/bird6_ipam.cfg.template +++ b/confd/etc/calico/confd/templates/bird6_ipam.cfg.template @@ -1,10 +1,8 @@ # Generated by confd function reject_disabled_pools () { -{{range ls "/v1/ipam/v6/pool"}}{{$data := json (getv (printf "/v1/ipam/v6/pool/%s" .))}} -{{- if $data.disableBGPExport}} - if ( net ~ {{$data.cidr}} ) then { reject; } -{{- end}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "reject" false "" 6 }} +{{ $line }} {{- end}} } @@ -62,15 +60,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { {{- end}} {{- end}} {{- end}} -{{range ls "/v1/ipam/v6/pool"}}{{$data := json (getv (printf "/v1/ipam/v6/pool/%s" .))}} -{{- if $data.disableBGPExport}} - # Skip {{$data.cidr}} as BGP export is disabled for it -{{- else}} - if ( net ~ {{$data.cidr}} ) then { - accept; - } -{{- end}} -{{- end}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "accept" false "" 6 }} +{{ $line }} +{{- end }} } filter calico_kernel_programming { @@ -85,13 +77,8 @@ filter calico_kernel_programming { {{- end}} {{- end}} -{{range ls "/v1/ipam/v6/pool"}}{{$data := json (getv (printf "/v1/ipam/v6/pool/%s" .))}} -{{- if $data.vxlan_mode}} - if ( net ~ {{$data.cidr}} ) then { - # Don't program VXLAN routes into the kernel - these are handled by Felix. - reject; - } -{{- end}}{{/* End of '$data.vxlan_mode' */}} -{{- end}}{{/* End of 'range ls...' */}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "reject" true "" 6 }} +{{ $line }} +{{- end}} accept; {{- /* Destination is not in any ipPool, accept */}} } diff --git a/confd/etc/calico/confd/templates/bird_ipam.cfg.template b/confd/etc/calico/confd/templates/bird_ipam.cfg.template index 803c46e995f..f2f82e1cdd2 100644 --- a/confd/etc/calico/confd/templates/bird_ipam.cfg.template +++ b/confd/etc/calico/confd/templates/bird_ipam.cfg.template @@ -1,10 +1,8 @@ # Generated by confd function reject_disabled_pools () { -{{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}} -{{- if $data.disableBGPExport}} - if ( net ~ {{$data.cidr}} ) then { reject; } -{{- end}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "reject" false "" 4 }} +{{ $line }} {{- end}} } @@ -62,15 +60,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { {{- end}} {{- end}} {{- end}} -{{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}} -{{- if $data.disableBGPExport}} - # Skip {{$data.cidr}} as BGP export is disabled for it -{{- else}} - if ( net ~ {{$data.cidr}} ) then { - accept; - } -{{- end}} -{{- end}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "accept" false "" 4 }} +{{ $line }} +{{- end }} } {{$network_key := printf "/bgp/v1/host/%s/network_v4" (getenv "NODENAME")}} @@ -87,26 +79,9 @@ filter calico_kernel_programming { {{- end}} {{- if exists $network_key}}{{$network := getv $network_key}} -{{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}} - if ( net ~ {{$data.cidr}} ) then { -{{- if $data.vxlan_mode}} - # Don't program VXLAN routes into the kernel - these are handled by Felix. - reject; - } -{{- else if $data.ipip_mode}}{{if eq $data.ipip_mode "cross-subnet"}} - if defined(bgp_next_hop) && ( bgp_next_hop ~ {{$network}} ) then - krt_tunnel = ""; {{- /* Destination in ipPool, mode is cross sub-net, route from-host on subnet, do not use IPIP */}} - else - krt_tunnel = "{{$data.ipip}}"; {{- /* Destination in ipPool, mode is cross sub-net, route from-host off subnet, set the tunnel (if IPIP not enabled, value will be "") */}} - accept; - } {{- else}} - krt_tunnel = "{{$data.ipip}}"; {{- /* Destination in ipPool, mode not cross sub-net, set the tunnel (if IPIP not enabled, value will be "") */}} - accept; - } {{- end}} {{- else}} - krt_tunnel = "{{$data.ipip}}"; {{- /* Destination in ipPool, mode field is not present, set the tunnel (if IPIP not enabled, value will be "") */}} - accept; - } {{- end}} -{{end}} -{{- end}}{{/* End of 'exists $network_key' */}} +{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "" true $network 4 }} +{{ $line }} +{{- end}} +{{- end}} accept; {{- /* Destination is not in any ipPool, accept */}} } diff --git a/confd/pkg/resource/template/template_funcs.go b/confd/pkg/resource/template/template_funcs.go index af3a38e35d2..d81e5eac60f 100644 --- a/confd/pkg/resource/template/template_funcs.go +++ b/confd/pkg/resource/template/template_funcs.go @@ -16,6 +16,8 @@ import ( v3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3" "github.com/projectcalico/calico/confd/pkg/backends" + "github.com/projectcalico/calico/libcalico-go/lib/backend/encap" + "github.com/projectcalico/calico/libcalico-go/lib/backend/model" ) func newFuncMap() map[string]interface{} { @@ -40,6 +42,7 @@ func newFuncMap() map[string]interface{} { m["base64Encode"] = Base64Encode m["base64Decode"] = Base64Decode m["bgpFilterBIRDFuncs"] = BGPFilterBIRDFuncs + m["ippoolsFilterBIRDFunc"] = IPPoolsFilterBIRDFunc return m } @@ -403,6 +406,128 @@ func BGPFilterBIRDFuncs(pairs memkv.KVPairs, version int) ([]string, error) { return lines, nil } +// This function generates BIRD statements for IPPool resources to be used as BIRD filters based on the following input: +// - pairs: IPPool resources packaged into KVPairs. +// - filterAction: specified action to filter generated statements. For exporting pools to BGP peers, we need to +// first reject disabled ippools, and then accept the rest at the end after all other filters. Allowed values are +// "accept", "reject", and "" (to not filter). +// - forProgrammingKernel: Whether the generated statements are intended for programming routes to kernel or exporting to +// other BGP Peers. As an example, we need to set "krt_tunnel" for programming IPIP and no-encap IPv4 routes. +// - localSubnet: the subnet of local node, which is needed by IPv4 IPIP pool in cross subnet mode. +// - version: the statement ip family. +// +// As an example, For the following sample IPPool resource: +// +// apiVersion: projectcalico.org/v3 +// kind: IPPool +// metadata: +// +// name: my.ippool-1 +// +// spec: +// +// cidr: 10.1.0.0/16 +// ipipMode: Always +// +// this function generates the following statement for programming routes to kernel: +// +// if (net ~ 10.10.0.0/16) then { krt_tunnel="tunl0"; accept; } +// +// and the following statement for exporting to BGP peers: +// +// if (net ~ 10.10.0.0/16) then { accept; } +func IPPoolsFilterBIRDFunc( + pairs memkv.KVPairs, + filterAction string, + forProgrammingKernel bool, + localSubnet string, + version int, +) ([]string, error) { + if version != 4 && version != 6 { + return []string{}, fmt.Errorf("version must be either 4 or 6") + } + + lines := []string{} + for _, kvp := range pairs { + var ippool model.IPPool + err := json.Unmarshal([]byte(kvp.Value), &ippool) + if err != nil { + return []string{}, fmt.Errorf("error unmarshalling JSON: %s", err) + } + + cidr := ippool.CIDR.String() + var action, comment, extraStatement string + switch { + case ippool.DisableBGPExport && !forProgrammingKernel: + // IPPool's BGP export is disabled, and filter is for exporting to other peers. + action = "reject" + comment = "BGP export is disabled." + case ippool.VXLANMode == encap.Always || ippool.VXLANMode == encap.CrossSubnet: + // VXLAN encapsulation is always handled by Felix. + if forProgrammingKernel { + // Felix always handles programming VXLAN IPPools. + action = "reject" + comment = "VXLAN routes are handled by Felix." + } else { + action = "accept" + } + case ippool.IPIPMode == encap.Always || ippool.IPIPMode == encap.CrossSubnet, // IPIP Encapsulation. + ippool.IPIPMode == encap.Undefined || ippool.VXLANMode == encap.Undefined: // No-encapsulation. + // IPIP encapsulation or No-Encap. + if forProgrammingKernel && version == 4 && len(localSubnet) != 0 { + // For IPv4 IPIP and no-encap routes, we need to set `krt_tunnel` variable which is needed by + // our fork of BIRD. + extraStatement = extraStatementForKernelProgrammingIPIPNoEncap(ippool.IPIPMode, localSubnet) + } + action = "accept" + default: + return nil, fmt.Errorf("invalid %s ippool", kvp.Key) + } + + // Filter statements based on provided filterAction. + if len(filterAction) != 0 && filterAction != action { + continue + } + lines = append(lines, emitFilterStatementForIPPools(cidr, extraStatement, action, comment)) + } + return lines, nil +} + +func extraStatementForKernelProgrammingIPIPNoEncap(ipipMode encap.Mode, localSubnet string) string { + switch v3.EncapMode(ipipMode) { + case v3.Always: + return `krt_tunnel="tunl0";` + case v3.CrossSubnet: + format := `if (defined(bgp_next_hop)&&(bgp_next_hop ~ %s)) then krt_tunnel=""; else krt_tunnel="tunl0";` + return fmt.Sprintf(format, localSubnet) + case v3.Undefined: + // No-encap case. + return `krt_tunnel="";` + default: + return `` + } +} + +func emitFilterStatementForIPPools(cidr, extraStatement, action, comment string) (statement string) { + // Check mandatory inputs. + if len(cidr) == 0 || len(action) == 0 { + return + } + if len(extraStatement) != 0 { + statement = fmt.Sprintf(" if (net ~ %s) then { %s %s; }", cidr, extraStatement, action) + } else { + statement = fmt.Sprintf(" if (net ~ %s) then { %s; }", cidr, action) + } + if len(comment) != 0 { + statement = fmt.Sprintf("%s %s", statement, formatComment(comment)) + } + return +} + +func formatComment(comment string) string { + return fmt.Sprintf("# %s", comment) +} + // Getenv retrieves the value of the environment variable named by the key. // It returns the value, which will the default value if the variable is not present. // If no default value was given - returns "". diff --git a/confd/pkg/resource/template/template_funcs_test.go b/confd/pkg/resource/template/template_funcs_test.go index a783b010129..b4560068541 100644 --- a/confd/pkg/resource/template/template_funcs_test.go +++ b/confd/pkg/resource/template/template_funcs_test.go @@ -2,11 +2,17 @@ package template import ( "encoding/json" + "fmt" "reflect" + "strings" "testing" "github.com/kelseyhightower/memkv" v3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3" + + "github.com/projectcalico/calico/libcalico-go/lib/backend/encap" + "github.com/projectcalico/calico/libcalico-go/lib/backend/model" + "github.com/projectcalico/calico/libcalico-go/lib/net" ) func Test_hashToIPv4_invalid_range(t *testing.T) { @@ -216,3 +222,175 @@ func Test_ValidateHashToIpv4Method(t *testing.T) { func int32Helper(i int32) *int32 { return &i } + +type ippoolTestCase struct { + cidr string + exportDisabled bool + ipipMode encap.Mode + vxlanMode encap.Mode +} + +var ( + poolsTestsV4 []ippoolTestCase = []ippoolTestCase{ + // IPv4 IPIP Encapsulation cases. + {cidr: "10.10.0.0/16", exportDisabled: false, ipipMode: encap.Always}, + {cidr: "10.11.0.0/16", exportDisabled: true, ipipMode: encap.Always}, + {cidr: "10.12.0.0/16", exportDisabled: false, ipipMode: encap.CrossSubnet}, + {cidr: "10.13.0.0/16", exportDisabled: true, ipipMode: encap.CrossSubnet}, + // IPv4 No-Encapsulation case. + {cidr: "10.14.0.0/16", exportDisabled: false}, + {cidr: "10.15.0.0/16", exportDisabled: true}, + // IPv4 VXLAN Encapsulation cases. + {cidr: "10.16.0.0/16", exportDisabled: false, vxlanMode: encap.Always}, + {cidr: "10.17.0.0/16", exportDisabled: true, vxlanMode: encap.Always}, + {cidr: "10.18.0.0/16", exportDisabled: false, vxlanMode: encap.CrossSubnet}, + {cidr: "10.19.0.0/16", exportDisabled: true, vxlanMode: encap.CrossSubnet}, + } + + poolsTestsV6 []ippoolTestCase = []ippoolTestCase{ + // IPv6 IPIP Encapsulation cases. + {cidr: "dead:beef:1::/64", exportDisabled: false, ipipMode: encap.Always}, + {cidr: "dead:beef:2::/64", exportDisabled: true, ipipMode: encap.Always}, + {cidr: "dead:beef:3::/64", exportDisabled: false, ipipMode: encap.CrossSubnet}, + {cidr: "dead:beef:4::/64", exportDisabled: true, ipipMode: encap.CrossSubnet}, + // IPv6 No-Encapsulation case. + {cidr: "dead:beef:5::/64", exportDisabled: false}, + {cidr: "dead:beef:6::/64", exportDisabled: true}, + // IPv6 VXLAN Encapsulation cases. + {cidr: "dead:beef:7::/64", exportDisabled: false, vxlanMode: encap.Always}, + {cidr: "dead:beef:8::/64", exportDisabled: true, vxlanMode: encap.Always}, + {cidr: "dead:beef:9::/64", exportDisabled: false, vxlanMode: encap.CrossSubnet}, + {cidr: "dead:beef:10::/64", exportDisabled: true, vxlanMode: encap.CrossSubnet}, + } +) + +func Test_IPPoolsFilterBIRDFunc_KernelProgrammingV4(t *testing.T) { + expectedStatements := []string{ + // IPv4 IPIP Encapsulation cases. + ` if (net ~ 10.10.0.0/16) then { krt_tunnel="tunl0"; accept; }`, + ` if (net ~ 10.11.0.0/16) then { krt_tunnel="tunl0"; accept; }`, + ` if (net ~ 10.12.0.0/16) then { if (defined(bgp_next_hop)&&(bgp_next_hop ~ 1.1.1.0/24)) then krt_tunnel=""; else krt_tunnel="tunl0"; accept; }`, + ` if (net ~ 10.13.0.0/16) then { if (defined(bgp_next_hop)&&(bgp_next_hop ~ 1.1.1.0/24)) then krt_tunnel=""; else krt_tunnel="tunl0"; accept; }`, + // IPv4 No-Encapsulation case. + ` if (net ~ 10.14.0.0/16) then { krt_tunnel=""; accept; }`, + ` if (net ~ 10.15.0.0/16) then { krt_tunnel=""; accept; }`, + // IPv4 VXLAN Encapsulation cases. + ` if (net ~ 10.16.0.0/16) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ 10.17.0.0/16) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ 10.18.0.0/16) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ 10.19.0.0/16) then { reject; } # VXLAN routes are handled by Felix.`, + } + testExpectedIPPoolStatments(t, poolsTestsV4, expectedStatements, true, "1.1.1.0/24", 4) +} + +func Test_IPPoolsFilterBIRDFunc_KernelProgrammingV6(t *testing.T) { + expectedStatements := []string{ + // IPv6 IPIP Encapsulation cases. + ` if (net ~ dead:beef:1::/64) then { accept; }`, + ` if (net ~ dead:beef:2::/64) then { accept; }`, + ` if (net ~ dead:beef:3::/64) then { accept; }`, + ` if (net ~ dead:beef:4::/64) then { accept; }`, + // IPv6 No-Encapsulation case. + ` if (net ~ dead:beef:5::/64) then { accept; }`, + ` if (net ~ dead:beef:6::/64) then { accept; }`, + // IPv6 VXLAN Encapsulation cases. + ` if (net ~ dead:beef:7::/64) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ dead:beef:8::/64) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ dead:beef:9::/64) then { reject; } # VXLAN routes are handled by Felix.`, + ` if (net ~ dead:beef:10::/64) then { reject; } # VXLAN routes are handled by Felix.`, + } + testExpectedIPPoolStatments(t, poolsTestsV6, expectedStatements, true, "", 6) +} + +func Test_IPPoolsFilterBIRDFunc_BGPPeeringV4(t *testing.T) { + expectedStatements := []string{ + // IPv4 IPIP Encapsulation cases. + ` if (net ~ 10.10.0.0/16) then { accept; }`, + ` if (net ~ 10.11.0.0/16) then { reject; } # BGP export is disabled.`, + ` if (net ~ 10.12.0.0/16) then { accept; }`, + ` if (net ~ 10.13.0.0/16) then { reject; } # BGP export is disabled.`, + // IPv4 No-Encapsulation case. + ` if (net ~ 10.14.0.0/16) then { accept; }`, + ` if (net ~ 10.15.0.0/16) then { reject; } # BGP export is disabled.`, + // IPv4 VXLAN Encapsulation cases. + ` if (net ~ 10.16.0.0/16) then { accept; }`, + ` if (net ~ 10.17.0.0/16) then { reject; } # BGP export is disabled.`, + ` if (net ~ 10.18.0.0/16) then { accept; }`, + ` if (net ~ 10.19.0.0/16) then { reject; } # BGP export is disabled.`, + } + testExpectedIPPoolStatments(t, poolsTestsV4, expectedStatements, false, "", 4) +} + +func Test_IPPoolsFilterBIRDFunc_BGPPeeringV6(t *testing.T) { + expectedStatements := []string{ + // IPv6 IPIP Encapsulation cases. + ` if (net ~ dead:beef:1::/64) then { accept; }`, + ` if (net ~ dead:beef:2::/64) then { reject; } # BGP export is disabled.`, + ` if (net ~ dead:beef:3::/64) then { accept; }`, + ` if (net ~ dead:beef:4::/64) then { reject; } # BGP export is disabled.`, + // IPv6 No-Encapsulation case. + ` if (net ~ dead:beef:5::/64) then { accept; }`, + ` if (net ~ dead:beef:6::/64) then { reject; } # BGP export is disabled.`, + // IPv6 VXLAN Encapsulation cases. + ` if (net ~ dead:beef:7::/64) then { accept; }`, + ` if (net ~ dead:beef:8::/64) then { reject; } # BGP export is disabled.`, + ` if (net ~ dead:beef:9::/64) then { accept; }`, + ` if (net ~ dead:beef:10::/64) then { reject; } # BGP export is disabled.`, + } + testExpectedIPPoolStatments(t, poolsTestsV6, expectedStatements, false, "", 6) +} + +func testExpectedIPPoolStatments( + t *testing.T, + tcs []ippoolTestCase, + expectedStatements []string, + forProgrammingKernel bool, + localSubnet string, + ipVersion int, +) { + kvps := ippoolTestCasesToKVPairs(t, tcs) + for _, filterAction := range []string{"", "accept", "reject"} { + expected := filterExpectedStatements(expectedStatements, filterAction) + generated, err := IPPoolsFilterBIRDFunc(kvps, filterAction, forProgrammingKernel, localSubnet, ipVersion) + if err != nil { + t.Errorf("Unexpected error while generating BIRD IPPool filter: %s", err) + } + if !reflect.DeepEqual(generated, expected) { + t.Errorf("Generated BIRD config differs from expectation:\n Generated=%#v,\n Expected=%#v", + generated, expected) + } + } +} + +func ippoolTestCasesToKVPairs(t *testing.T, tcs []ippoolTestCase) memkv.KVPairs { + kvps := []memkv.KVPair{} + for _, tc := range tcs { + ippool := model.IPPool{} + ippool.CIDR = net.MustParseCIDR(tc.cidr) + ippool.IPIPMode = tc.ipipMode + ippool.VXLANMode = tc.vxlanMode + ippool.DisableBGPExport = tc.exportDisabled + + jsonIPPool, err := json.Marshal(ippool) + if err != nil { + t.Errorf("Error formatting IPPool into JSON: %s", err) + } + kvps = append(kvps, memkv.KVPair{ + Key: fmt.Sprintf("ippool-%s", tc.cidr), + Value: string(jsonIPPool), + }) + } + return kvps +} + +func filterExpectedStatements(statements []string, filterAction string) (filtered []string) { + if len(filterAction) == 0 { + return statements + } + for _, s := range statements { + if strings.Contains(s, fmt.Sprintf("%s; }", filterAction)) { + filtered = append(filtered, s) + } + } + return +} diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6.cfg index a88604fc9a6..15c29057b00 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6.cfg @@ -100,3 +100,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6.cfg index aeeb6bfe467..2e9d4c963a0 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6.cfg @@ -93,3 +93,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/export_only/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6.cfg index 031c0b150d0..48b80f2acbd 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6.cfg @@ -101,3 +101,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step1/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6.cfg index bd59021816b..efb00b46f3c 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_deletion/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_names/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/filter_names/bird6.cfg index e19e7ff8a9b..c408ba27b5f 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_names/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_names/bird6.cfg @@ -123,3 +123,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/filter_names/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_names/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_names/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_names/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/filter_names/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/filter_names/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/filter_names/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/filter_names/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6.cfg index 5e1b3dd42a5..74d1a0c87b4 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6.cfg @@ -100,3 +100,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6.cfg index ab2fd13bfec..f2910bde96b 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6.cfg @@ -93,3 +93,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/import_only/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_interface/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/match_interface/bird6.cfg index e687e3f432f..36310de54ec 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_interface/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_interface/bird6.cfg @@ -101,3 +101,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/match_interface/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_interface/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_interface/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_interface/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_interface/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_interface/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_interface/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_interface/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_operators/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/match_operators/bird6.cfg index 39450de3c78..8d6c924251c 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_operators/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_operators/bird6.cfg @@ -101,3 +101,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/match_operators/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_operators/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_operators/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_operators/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_operators/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_operators/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_operators/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_operators/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_source/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/match_source/bird6.cfg index 39e7b96a214..babf81190c8 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_source/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_source/bird6.cfg @@ -97,3 +97,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/match_source/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_source/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_source/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_source/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/match_source/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/match_source/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/match_source/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/match_source/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6.cfg index bf6830d114e..b936204b558 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6.cfg @@ -120,3 +120,5 @@ protocol bgp Global_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6.cfg index 78de6f27714..1456bd0051e 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6.cfg @@ -118,3 +118,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/multi_filter/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6.cfg index d18d5a7ab62..c1e96fe5bed 100644 --- a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6.cfg @@ -93,3 +93,5 @@ protocol bgp Mesh_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/node_mesh/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/node_mesh/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6.cfg index 0a04ac2599f..3ba314fbb85 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6.cfg @@ -114,3 +114,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6.cfg index 6d64d25bbde..be94806aed6 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6.cfg @@ -101,3 +101,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/single_filter/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6.cfg index a4efff4c4af..be0a9a9c185 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6.cfg index bd59021816b..efb00b46f3c 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v4_only/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6.cfg index 0d49a3e1223..874cf97136a 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6.cfg @@ -114,3 +114,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/explicit_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6.cfg index cd0ab6fc9ca..b9329fd6a75 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6.cfg @@ -101,3 +101,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird_ipam.cfg b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/bgpfilter/v6_only/global_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global-external/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/global-external/bird6.cfg index f242abbca13..d8fc709da3e 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-external/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-external/bird6.cfg @@ -46,3 +46,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/explicit_peering/global-external/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global-external/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-external/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-external/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global-external/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global-external/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-external/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-external/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6.cfg index 6f8cd0f5429..efd94428c07 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Global_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global-ipv6/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/global/bird6.cfg index f242abbca13..d8fc709da3e 100644 --- a/confd/tests/compiled_templates/explicit_peering/global/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global/bird6.cfg @@ -46,3 +46,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/explicit_peering/global/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/global/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/global/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/global/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/global/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/global/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6.cfg index 91e84b5fdb6..0ddcc956719 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6.cfg @@ -73,3 +73,5 @@ protocol bgp Global_ac13__57_port_50 from bgp_template { }; # Only want to export routes for workloads. next hop keep; } + + diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop-global/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6.cfg index bc046a60e83..658e12d2b6d 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6.cfg @@ -73,3 +73,5 @@ protocol bgp Node_ac13__57_port_50 from bgp_template { }; # Only want to export routes for workloads. next hop keep; } + + diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/keepnexthop/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-global-ipv6/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6.cfg index f242abbca13..d8fc709da3e 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6.cfg @@ -46,3 +46,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-global/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-global/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as-ipv6/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/local-as/bird6.cfg index 2317b8ef6c3..79551934020 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/explicit_peering/local-as/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local-as/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local-as/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/local-as/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local-as/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6.cfg index c5069273f60..a9b763a8410 100644 --- a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6.cfg @@ -92,3 +92,5 @@ protocol bgp Local_Workload_fd00_10_244_0_586d_4461_e980_a286 from bgp_template }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/local_bgp_peer/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6.cfg index ac6b83874f9..e075e7d8b4d 100644 --- a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6.cfg @@ -102,3 +102,5 @@ protocol bgp Node_fe0a__4 from bgp_template { rr client; rr cluster id 10.0.0.1; } + + diff --git a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/route_reflector/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/route_reflector/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/route_reflector_v6_by_ip/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/bird6.cfg index f20e41896c1..db6313ad243 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Node_fd5f__4 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6.cfg index 0a9b2c1d763..8e9d72065a6 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Node_fd5f__4 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/selectors/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/specific_node/bird6.cfg b/confd/tests/compiled_templates/explicit_peering/specific_node/bird6.cfg index 2317b8ef6c3..79551934020 100644 --- a/confd/tests/compiled_templates/explicit_peering/specific_node/bird6.cfg +++ b/confd/tests/compiled_templates/explicit_peering/specific_node/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/explicit_peering/specific_node/bird6_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/specific_node/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/explicit_peering/specific_node/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/specific_node/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/explicit_peering/specific_node/bird_ipam.cfg b/confd/tests/compiled_templates/explicit_peering/specific_node/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/explicit_peering/specific_node/bird_ipam.cfg +++ b/confd/tests/compiled_templates/explicit_peering/specific_node/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/ignored_interfaces/bird6.cfg b/confd/tests/compiled_templates/ignored_interfaces/bird6.cfg index 653956e20a6..5a87108a0e7 100644 --- a/confd/tests/compiled_templates/ignored_interfaces/bird6.cfg +++ b/confd/tests/compiled_templates/ignored_interfaces/bird6.cfg @@ -72,3 +72,5 @@ protocol bgp Mesh_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/ignored_interfaces/bird6_ipam.cfg b/confd/tests/compiled_templates/ignored_interfaces/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/ignored_interfaces/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/ignored_interfaces/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ignored_interfaces/bird_ipam.cfg b/confd/tests/compiled_templates/ignored_interfaces/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/ignored_interfaces/bird_ipam.cfg +++ b/confd/tests/compiled_templates/ignored_interfaces/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/bgp-export/bird6.cfg b/confd/tests/compiled_templates/mesh/bgp-export/bird6.cfg index 2317b8ef6c3..79551934020 100644 --- a/confd/tests/compiled_templates/mesh/bgp-export/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/bgp-export/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/mesh/bgp-export/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/bgp-export/bird6_ipam.cfg index 2706563a32a..e8fdfebb07d 100644 --- a/confd/tests/compiled_templates/mesh/bgp-export/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/bgp-export/bird6_ipam.cfg @@ -1,8 +1,7 @@ # Generated by confd function reject_disabled_pools () { - - if ( net ~ 2002:102::/64 ) then { reject; } + if (net ~ 2002:102::/64) then { reject; } # BGP export is disabled. } function reject_tunnel_routes () { @@ -35,17 +34,10 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002:101::/64 ) then { - accept; - } - # Skip 2002:102::/64 as BGP export is disabled for it - if ( net ~ 2002:103::/64 ) then { - accept; - } + if (net ~ 2002:101::/64) then { accept; } + if (net ~ 2002:103::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/bgp-export/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/bgp-export/bird_ipam.cfg index 6f9ad064e34..105a59547cb 100644 --- a/confd/tests/compiled_templates/mesh/bgp-export/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/bgp-export/bird_ipam.cfg @@ -1,8 +1,7 @@ # Generated by confd function reject_disabled_pools () { - - if ( net ~ 192.168.2.0/24 ) then { reject; } + if (net ~ 192.168.2.0/24) then { reject; } # BGP export is disabled. } function reject_tunnel_routes () { @@ -35,33 +34,14 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.1.0/24 ) then { - accept; - } - # Skip 192.168.2.0/24 as BGP export is disabled for it - if ( net ~ 192.168.3.0/24 ) then { - accept; - } + if (net ~ 192.168.1.0/24) then { accept; } + if (net ~ 192.168.3.0/24) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.1.0/24 ) then { - krt_tunnel = ""; - accept; - } - - if ( net ~ 192.168.2.0/24 ) then { - krt_tunnel = ""; - accept; - } - - if ( net ~ 192.168.3.0/24 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.1.0/24) then { krt_tunnel=""; accept; } + if (net ~ 192.168.2.0/24) then { krt_tunnel=""; accept; } + if (net ~ 192.168.3.0/24) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/communities/bird6.cfg b/confd/tests/compiled_templates/mesh/communities/bird6.cfg index be66ce71c66..3f691ca970e 100644 --- a/confd/tests/compiled_templates/mesh/communities/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/communities/bird6.cfg @@ -49,3 +49,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/mesh/communities/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/communities/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/communities/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/communities/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/communities/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/communities/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/communities/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/communities/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/communities/step2/bird6.cfg b/confd/tests/compiled_templates/mesh/communities/step2/bird6.cfg index 0e11c8ef3bc..34ecd5163ba 100644 --- a/confd/tests/compiled_templates/mesh/communities/step2/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/communities/step2/bird6.cfg @@ -49,3 +49,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/mesh/communities/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/communities/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/communities/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/communities/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/communities/step2/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/communities/step2/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/communities/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/communities/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/hash/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/hash/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/hash/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/hash/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/hash/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/hash/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/hash/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/hash/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-always/bird6.cfg b/confd/tests/compiled_templates/mesh/ipip-always/bird6.cfg index 2317b8ef6c3..79551934020 100644 --- a/confd/tests/compiled_templates/mesh/ipip-always/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-always/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/mesh/ipip-always/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-always/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/ipip-always/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-always/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-always/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-always/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/mesh/ipip-always/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-always/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6.cfg b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6.cfg index 2317b8ef6c3..79551934020 100644 --- a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg index 57300f8a0a5..c76bff0f382 100644 --- a/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,22 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - if defined(bgp_next_hop) && ( bgp_next_hop ~ 10.192.0.0/16 ) then - krt_tunnel = ""; - else - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { if (defined(bgp_next_hop)&&(bgp_next_hop ~ 10.192.0.0/16)) then krt_tunnel=""; else krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-off/bird6.cfg b/confd/tests/compiled_templates/mesh/ipip-off/bird6.cfg index 17beb4475ff..22377411dc6 100644 --- a/confd/tests/compiled_templates/mesh/ipip-off/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-off/bird6.cfg @@ -80,3 +80,5 @@ protocol bgp Mesh_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/ipip-off/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-off/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/mesh/ipip-off/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-off/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/ipip-off/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/ipip-off/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/ipip-off/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/ipip-off/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step1/bird6.cfg b/confd/tests/compiled_templates/mesh/password/step1/bird6.cfg index 17beb4475ff..22377411dc6 100644 --- a/confd/tests/compiled_templates/mesh/password/step1/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/password/step1/bird6.cfg @@ -80,3 +80,5 @@ protocol bgp Mesh_2001__104 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/password/step1/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step1/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/mesh/password/step1/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step1/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step1/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step1/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/password/step1/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step1/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step2/bird6.cfg b/confd/tests/compiled_templates/mesh/password/step2/bird6.cfg index f1e5d60f4bf..ca4cf3d9c6c 100644 --- a/confd/tests/compiled_templates/mesh/password/step2/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/password/step2/bird6.cfg @@ -82,3 +82,5 @@ protocol bgp Mesh_2001__104 from bgp_template { passive on; password "password-a"; } + + diff --git a/confd/tests/compiled_templates/mesh/password/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step2/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/mesh/password/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step2/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step2/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/password/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step3/bird6.cfg b/confd/tests/compiled_templates/mesh/password/step3/bird6.cfg index 8c53cb42594..2c69dbf5c86 100644 --- a/confd/tests/compiled_templates/mesh/password/step3/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/password/step3/bird6.cfg @@ -82,3 +82,5 @@ protocol bgp Mesh_2001__104 from bgp_template { passive on; password "new-password-a"; } + + diff --git a/confd/tests/compiled_templates/mesh/password/step3/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step3/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/mesh/password/step3/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step3/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/password/step3/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/password/step3/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/password/step3/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/password/step3/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/restart-time/bird6.cfg b/confd/tests/compiled_templates/mesh/restart-time/bird6.cfg index 28bd59ef9cc..dc6061077ef 100644 --- a/confd/tests/compiled_templates/mesh/restart-time/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/restart-time/bird6.cfg @@ -82,3 +82,5 @@ protocol bgp Mesh_2001__104 from bgp_template { passive on; graceful restart time 10; } + + diff --git a/confd/tests/compiled_templates/mesh/restart-time/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/restart-time/bird6_ipam.cfg index 6fd518a50a9..64a578bc047 100644 --- a/confd/tests/compiled_templates/mesh/restart-time/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/restart-time/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 2002::/64 ) then { - accept; - } + if (net ~ 2002::/64) then { accept; } } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/restart-time/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/restart-time/bird_ipam.cfg index 6bf2288cb65..3ca4ae7db92 100644 --- a/confd/tests/compiled_templates/mesh/restart-time/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/restart-time/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = ""; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel=""; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6.cfg b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6.cfg index ad0121ba336..b65b0351298 100644 --- a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6.cfg @@ -83,3 +83,5 @@ protocol bgp Node_fe0a__6 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/route-reflector-mesh-enabled/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6.cfg index d7102792bf1..38cdf2e0762 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6.cfg @@ -81,3 +81,5 @@ protocol bgp Mesh_fdf5_10__4 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6_ipam.cfg index 1a5c1e90049..4c7bd2a20a5 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,13 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { # Don't program static routes into kernel. if ( net ~ fd00:96::/112 ) then { reject; } - accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird_ipam.cfg index 025d4909edb..c0a4898029c 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,7 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } @@ -45,11 +41,6 @@ filter calico_kernel_programming { # Don't program static routes into kernel. if ( net ~ 10.101.0.0/16 ) then { reject; } - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6.cfg index d7102792bf1..38cdf2e0762 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6.cfg @@ -81,3 +81,5 @@ protocol bgp Mesh_fdf5_10__4 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-exclude-node/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird_ipam.cfg index ddc693f28ff..f6d5c12d54b 100644 --- a/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes-no-ipv4-address/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -38,10 +37,7 @@ function calico_export_to_bgp_peers(bool internal_peer) { # Export static routes. if ( net ~ 10.101.0.0/16 ) then { accept; } if ( net ~ 10.101.0.101/32 ) then { accept; } - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } diff --git a/confd/tests/compiled_templates/mesh/static-routes/bird6.cfg b/confd/tests/compiled_templates/mesh/static-routes/bird6.cfg index d7102792bf1..38cdf2e0762 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/bird6.cfg @@ -81,3 +81,5 @@ protocol bgp Mesh_fdf5_10__4 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/static-routes/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes/bird6_ipam.cfg index 7e615a4af05..df4f18fe663 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -38,13 +37,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { # Export static routes. if ( net ~ fd00:96::/112 ) then { accept; } if ( net ~ fd00:96::28/128 ) then { accept; } - } filter calico_kernel_programming { # Don't program static routes into kernel. if ( net ~ fd00:96::/112 ) then { reject; } - accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes/bird_ipam.cfg index 7462b303165..f49735015b9 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -39,10 +38,7 @@ function calico_export_to_bgp_peers(bool internal_peer) { if ( net ~ 10.101.0.0/16 ) then { accept; } if ( net ~ 10.101.0.101/32 ) then { accept; } if ( net ~ 80.15.0.0/24 ) then { accept; } - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } @@ -51,11 +47,6 @@ filter calico_kernel_programming { # Don't program static routes into kernel. if ( net ~ 10.101.0.0/16 ) then { reject; } if ( net ~ 80.15.0.0/24 ) then { reject; } - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes/step2/bird6.cfg b/confd/tests/compiled_templates/mesh/static-routes/step2/bird6.cfg index d7102792bf1..38cdf2e0762 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/step2/bird6.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/step2/bird6.cfg @@ -81,3 +81,5 @@ protocol bgp Mesh_fdf5_10__4 from bgp_template { }; # Only want to export routes for workloads. passive on; } + + diff --git a/confd/tests/compiled_templates/mesh/static-routes/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/mesh/static-routes/step2/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/static-routes/step2/bird_ipam.cfg index 8c4453f41a1..cb7dcf8318b 100644 --- a/confd/tests/compiled_templates/mesh/static-routes/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/static-routes/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - krt_tunnel = "tunl0"; - accept; - } - + if (net ~ 192.168.0.0/16) then { krt_tunnel="tunl0"; accept; } accept; } diff --git a/confd/tests/compiled_templates/mesh/vxlan-always/bird6_ipam.cfg b/confd/tests/compiled_templates/mesh/vxlan-always/bird6_ipam.cfg index 1bc8a213447..14d183d493c 100644 --- a/confd/tests/compiled_templates/mesh/vxlan-always/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/vxlan-always/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,17 +33,10 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ dead:beef::/64 ) then { - accept; - } + if (net ~ dead:beef::/64) then { accept; } } filter calico_kernel_programming { - - if ( net ~ dead:beef::/64 ) then { - # Don't program VXLAN routes into the kernel - these are handled by Felix. - reject; - } + if (net ~ dead:beef::/64) then { reject; } # VXLAN routes are handled by Felix. accept; } diff --git a/confd/tests/compiled_templates/mesh/vxlan-always/bird_ipam.cfg b/confd/tests/compiled_templates/mesh/vxlan-always/bird_ipam.cfg index 22bf027b62f..3aec5a40637 100644 --- a/confd/tests/compiled_templates/mesh/vxlan-always/bird_ipam.cfg +++ b/confd/tests/compiled_templates/mesh/vxlan-always/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,19 +33,11 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - - if ( net ~ 192.168.0.0/16 ) then { - accept; - } + if (net ~ 192.168.0.0/16) then { accept; } } filter calico_kernel_programming { - - if ( net ~ 192.168.0.0/16 ) then { - # Don't program VXLAN routes into the kernel - these are handled by Felix. - reject; - } - + if (net ~ 192.168.0.0/16) then { reject; } # VXLAN routes are handled by Felix. accept; } diff --git a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6.cfg b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6.cfg index 7490a89c674..62dc185bd61 100644 --- a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6.cfg @@ -87,3 +87,5 @@ protocol bgp Global_ffee__11 from bgp_template { }; # Only want to export routes for workloads. next hop self; } + + diff --git a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6_ipam.cfg b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird_ipam.cfg b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/next_hop_mode/global_peers/bird_ipam.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/global_peers/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6.cfg b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6.cfg index d1ad6246de5..b89d4889825 100644 --- a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6.cfg @@ -113,3 +113,5 @@ protocol bgp Node_ffee__11 from bgp_template { }; # Only want to export routes for workloads. next hop self; } + + diff --git a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6_ipam.cfg b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird_ipam.cfg b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird_ipam.cfg +++ b/confd/tests/compiled_templates/next_hop_mode/route_reflectors/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password-deadlock/bird6_ipam.cfg b/confd/tests/compiled_templates/password-deadlock/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password-deadlock/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password-deadlock/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password-deadlock/bird_ipam.cfg b/confd/tests/compiled_templates/password-deadlock/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password-deadlock/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password-deadlock/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step1/bird6.cfg b/confd/tests/compiled_templates/password/step1/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step1/bird6.cfg +++ b/confd/tests/compiled_templates/password/step1/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step1/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step1/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step1/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step1/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step1/bird_ipam.cfg b/confd/tests/compiled_templates/password/step1/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step1/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step1/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step2/bird6.cfg b/confd/tests/compiled_templates/password/step2/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step2/bird6.cfg +++ b/confd/tests/compiled_templates/password/step2/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step2/bird_ipam.cfg b/confd/tests/compiled_templates/password/step2/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step3/bird6.cfg b/confd/tests/compiled_templates/password/step3/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step3/bird6.cfg +++ b/confd/tests/compiled_templates/password/step3/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step3/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step3/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step3/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step3/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step3/bird_ipam.cfg b/confd/tests/compiled_templates/password/step3/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step3/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step3/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step4/bird6.cfg b/confd/tests/compiled_templates/password/step4/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step4/bird6.cfg +++ b/confd/tests/compiled_templates/password/step4/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step4/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step4/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step4/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step4/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step4/bird_ipam.cfg b/confd/tests/compiled_templates/password/step4/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step4/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step4/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step5/bird6.cfg b/confd/tests/compiled_templates/password/step5/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step5/bird6.cfg +++ b/confd/tests/compiled_templates/password/step5/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step5/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step5/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step5/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step5/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step5/bird_ipam.cfg b/confd/tests/compiled_templates/password/step5/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step5/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step5/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step6/bird6.cfg b/confd/tests/compiled_templates/password/step6/bird6.cfg index 7c976c7ed1e..a4efdde987a 100644 --- a/confd/tests/compiled_templates/password/step6/bird6.cfg +++ b/confd/tests/compiled_templates/password/step6/bird6.cfg @@ -5,6 +5,7 @@ function apply_communities () # Generated by confd include "bird6_aggr.cfg"; include "bird6_ipam.cfg"; + router id 10.24.0.1; # Configure synchronization between routing tables and kernel. @@ -43,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/password/step6/bird6_ipam.cfg b/confd/tests/compiled_templates/password/step6/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/password/step6/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/password/step6/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/password/step6/bird_ipam.cfg b/confd/tests/compiled_templates/password/step6/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/password/step6/bird_ipam.cfg +++ b/confd/tests/compiled_templates/password/step6/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reachable_by/global_peers/bird6.cfg b/confd/tests/compiled_templates/reachable_by/global_peers/bird6.cfg index 1e019347bb6..9a4e73bd5d9 100644 --- a/confd/tests/compiled_templates/reachable_by/global_peers/bird6.cfg +++ b/confd/tests/compiled_templates/reachable_by/global_peers/bird6.cfg @@ -87,3 +87,5 @@ protocol bgp Global_ffee__11 from bgp_template { }; # Only want to export routes for workloads. next hop keep; } + + diff --git a/confd/tests/compiled_templates/reachable_by/global_peers/bird6_ipam.cfg b/confd/tests/compiled_templates/reachable_by/global_peers/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/reachable_by/global_peers/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/reachable_by/global_peers/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reachable_by/global_peers/bird_ipam.cfg b/confd/tests/compiled_templates/reachable_by/global_peers/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/reachable_by/global_peers/bird_ipam.cfg +++ b/confd/tests/compiled_templates/reachable_by/global_peers/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6.cfg b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6.cfg index f7ff39a614d..0dde3f09e05 100644 --- a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6.cfg +++ b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6.cfg @@ -113,3 +113,5 @@ protocol bgp Node_ffee__11 from bgp_template { }; # Only want to export routes for workloads. next hop keep; } + + diff --git a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6_ipam.cfg b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird_ipam.cfg b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/reachable_by/route_reflectors/bird_ipam.cfg +++ b/confd/tests/compiled_templates/reachable_by/route_reflectors/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reverse_peering/auto/bird6.cfg b/confd/tests/compiled_templates/reverse_peering/auto/bird6.cfg index df582d075df..2e75c4d52a3 100644 --- a/confd/tests/compiled_templates/reverse_peering/auto/bird6.cfg +++ b/confd/tests/compiled_templates/reverse_peering/auto/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/reverse_peering/auto/bird6_ipam.cfg b/confd/tests/compiled_templates/reverse_peering/auto/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/reverse_peering/auto/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/reverse_peering/auto/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reverse_peering/auto/bird_ipam.cfg b/confd/tests/compiled_templates/reverse_peering/auto/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/reverse_peering/auto/bird_ipam.cfg +++ b/confd/tests/compiled_templates/reverse_peering/auto/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reverse_peering/manual/bird6.cfg b/confd/tests/compiled_templates/reverse_peering/manual/bird6.cfg index 9ccdd11b138..953f3a2bb91 100644 --- a/confd/tests/compiled_templates/reverse_peering/manual/bird6.cfg +++ b/confd/tests/compiled_templates/reverse_peering/manual/bird6.cfg @@ -59,3 +59,5 @@ template bgp bgp_template { # -------------- BGP Filters ------------------ # No v6 BGPFilters configured # No BGP peers configured for this node + + diff --git a/confd/tests/compiled_templates/reverse_peering/manual/bird6_ipam.cfg b/confd/tests/compiled_templates/reverse_peering/manual/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/reverse_peering/manual/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/reverse_peering/manual/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/reverse_peering/manual/bird_ipam.cfg b/confd/tests/compiled_templates/reverse_peering/manual/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/reverse_peering/manual/bird_ipam.cfg +++ b/confd/tests/compiled_templates/reverse_peering/manual/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6.cfg index 027469e61f2..0d55cdb741a 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step1/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6.cfg index 027469e61f2..0d55cdb741a 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step2/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6.cfg index 027469e61f2..0d55cdb741a 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6.cfg @@ -44,3 +44,4 @@ protocol direct { } # IPv6 disabled on this node. + diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird_ipam.cfg b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird_ipam.cfg +++ b/confd/tests/compiled_templates/sourceaddr_gracefulrestart/step3/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/explicit_node/bird6.cfg b/confd/tests/compiled_templates/ttl_security/explicit_node/bird6.cfg index 9ccdd11b138..953f3a2bb91 100644 --- a/confd/tests/compiled_templates/ttl_security/explicit_node/bird6.cfg +++ b/confd/tests/compiled_templates/ttl_security/explicit_node/bird6.cfg @@ -59,3 +59,5 @@ template bgp bgp_template { # -------------- BGP Filters ------------------ # No v6 BGPFilters configured # No BGP peers configured for this node + + diff --git a/confd/tests/compiled_templates/ttl_security/explicit_node/bird6_ipam.cfg b/confd/tests/compiled_templates/ttl_security/explicit_node/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/ttl_security/explicit_node/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/explicit_node/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/explicit_node/bird_ipam.cfg b/confd/tests/compiled_templates/ttl_security/explicit_node/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/ttl_security/explicit_node/bird_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/explicit_node/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/global/bird6.cfg b/confd/tests/compiled_templates/ttl_security/global/bird6.cfg index fd94da38d48..4f442493842 100644 --- a/confd/tests/compiled_templates/ttl_security/global/bird6.cfg +++ b/confd/tests/compiled_templates/ttl_security/global/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Global_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/ttl_security/global/bird6_ipam.cfg b/confd/tests/compiled_templates/ttl_security/global/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/ttl_security/global/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/global/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/global/bird_ipam.cfg b/confd/tests/compiled_templates/ttl_security/global/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/ttl_security/global/bird_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/global/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/peer_selector/bird6.cfg b/confd/tests/compiled_templates/ttl_security/peer_selector/bird6.cfg index 19aa91e6380..efa2d90c1e9 100644 --- a/confd/tests/compiled_templates/ttl_security/peer_selector/bird6.cfg +++ b/confd/tests/compiled_templates/ttl_security/peer_selector/bird6.cfg @@ -85,3 +85,5 @@ protocol bgp Node_2001__104 from bgp_template { reject; }; # Only want to export routes for workloads. } + + diff --git a/confd/tests/compiled_templates/ttl_security/peer_selector/bird6_ipam.cfg b/confd/tests/compiled_templates/ttl_security/peer_selector/bird6_ipam.cfg index d7daa3928e5..a4ddeb21e47 100644 --- a/confd/tests/compiled_templates/ttl_security/peer_selector/bird6_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/peer_selector/bird6_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,10 +33,8 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; } diff --git a/confd/tests/compiled_templates/ttl_security/peer_selector/bird_ipam.cfg b/confd/tests/compiled_templates/ttl_security/peer_selector/bird_ipam.cfg index 284fa44f216..735fc295b8c 100644 --- a/confd/tests/compiled_templates/ttl_security/peer_selector/bird_ipam.cfg +++ b/confd/tests/compiled_templates/ttl_security/peer_selector/bird_ipam.cfg @@ -1,7 +1,6 @@ # Generated by confd function reject_disabled_pools () { - } function reject_tunnel_routes () { @@ -34,11 +33,9 @@ function calico_export_to_bgp_peers(bool internal_peer) { reject_local_routes(); apply_communities(); calico_aggr(); - } filter calico_kernel_programming { - accept; }