Don't advertise blocks with pending affinity

projectcalico · Mar 2, 2018 · ae79ed3 · ae79ed3
1 parent 400387f
commit ae79ed3
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/calico_node/filesystem/etc/calico/confd/templates/bird_aggr.cfg.template b/calico_node/filesystem/etc/calico/confd/templates/bird_aggr.cfg.template
@@ -16,7 +16,19 @@ function calico_aggr ()
 {{range ls "/"}}
 {{$parts := split . "-"}}
 {{$cidr := join $parts "/"}}
-  if ( net = {{$cidr}} ) then { accept; }
-  if ( net ~ {{$cidr}} ) then { reject; }
+{{$affinity := json (getv (printf "/%s" .))}}
+
+  {{if $affinity.state}}
+      # Block {{$cidr}} is {{$affinity.state}}
+    {{if eq $affinity.state "confirmed"}}
+      if ( net = {{$cidr}} ) then { accept; }
+      if ( net ~ {{$cidr}} ) then { reject; }
+    {{end}}
+  {{ else }}
+      # Block {{$cidr}} is implicitly confirmed.
+      if ( net = {{$cidr}} ) then { accept; }
+      if ( net ~ {{$cidr}} ) then { reject; }
+  {{ end }}
+
 {{end}}
 }