Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions confd/etc/calico/confd/templates/bird6_ipam.cfg.template
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "reject" false "" 6 }}
{{ $line }}
{{- end}}
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -27,9 +20,11 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "reject" false "" 6 }}
{{ $line }}
{{- end}}

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down Expand Up @@ -60,6 +55,7 @@ function calico_export_to_bgp_peers(bool internal_peer) {
{{- end}}
{{- end}}
{{- end}}

{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v6/pool/*") "accept" false "" 6 }}
{{ $line }}
{{- end }}
Expand Down
16 changes: 6 additions & 10 deletions confd/etc/calico/confd/templates/bird_ipam.cfg.template
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "reject" false "" 4 }}
{{ $line }}
{{- end}}
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -27,9 +20,11 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "reject" false "" 4 }}
{{ $line }}
{{- end}}

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down Expand Up @@ -78,6 +73,7 @@ filter calico_kernel_programming {
{{- end}}

{{- end}}

{{- if exists $network_key}}{{$network := getv $network_key}}
{{- range $line := ippoolsFilterBIRDFunc (gets "/v1/ipam/v4/pool/*") "" true $network 4 }}
{{ $line }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Generated by confd
function reject_disabled_pools ()
{
}

function reject_tunnel_routes () {
# Don't export tunnel routes to other nodes, Felix programs them.
# IPIP routes are handled by Bird, and it does not re-advertise them.
Expand All @@ -24,9 +20,7 @@ function reject_local_routes () {

function calico_export_to_bgp_peers(bool internal_peer) {
# filter code terminates when it calls `accept;` or `reject;`,
# call reject_disabled_pools() first, then reject_tunnel_routes(),
# then apply_communities() and then calico_aggr()
reject_disabled_pools();

if (internal_peer) then {
reject_tunnel_routes();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocol static {
route 192.168.221.64/26 blackhole;
}


# Aggregation of routes on this host; export the block, nothing beneath it.
function calico_aggr ()
{
Expand Down
Loading