fix: always update firewall rules (kubespan)

Fixes #8498 Before KubeSpan was reimplemented to use resources for firewall rules, the update was happening always, but it got moved to a wrong section of the controller which gets executed on resource updates, but ignores updates of the peer statuses. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit e7d8041)
siderolabs · Jul 22, 2024 · 67c76e8 · 67c76e8
1 parent 65a9275
commit 67c76e8
Showing 1 changed file with 95 additions and 94 deletions.
diff --git a/internal/app/machined/pkg/controllers/kubespan/manager.go b/internal/app/machined/pkg/controllers/kubespan/manager.go
@@ -356,6 +356,101 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo
 			}
 		}
 
+		mtu := cfgSpec.MTU
+
+		// always update the firewall rules, as allowedIPsSet might change at any moment due to peer up/down events
+		if err = safe.WriterModify(ctx, r,
+			network.NewNfTablesChain(
+				network.NamespaceName,
+				"kubespan_prerouting",
+			),
+			func(r *network.NfTablesChain) error {
+				spec := r.TypedSpec()
+
+				spec.Type = nethelpers.ChainTypeFilter
+				spec.Hook = nethelpers.ChainHookPrerouting
+				spec.Priority = nethelpers.ChainPriorityFilter
+				spec.Policy = nethelpers.VerdictAccept
+
+				spec.Rules = []network.NfTablesRule{
+					{
+						MatchMark: &network.NfTablesMark{
+							Mask:  constants.KubeSpanDefaultFirewallMask,
+							Value: constants.KubeSpanDefaultFirewallMark,
+						},
+						Verdict: pointer.To(nethelpers.VerdictAccept),
+					},
+					{
+						MatchDestinationAddress: &network.NfTablesAddressMatch{
+							IncludeSubnets: allowedIPsSet.Prefixes(),
+						},
+						SetMark: &network.NfTablesMark{
+							Mask: ^uint32(constants.KubeSpanDefaultFirewallMask),
+							Xor:  constants.KubeSpanDefaultForceFirewallMark,
+						},
+						Verdict: pointer.To(nethelpers.VerdictAccept),
+					},
+				}
+
+				return nil
+			},
+		); err != nil {
+			return fmt.Errorf("error modifying nftables chain: %w", err)
+		}
+
+		if err = safe.WriterModify(ctx, r,
+			network.NewNfTablesChain(
+				network.NamespaceName,
+				"kubespan_outgoing",
+			),
+			func(r *network.NfTablesChain) error {
+				spec := r.TypedSpec()
+
+				spec.Type = nethelpers.ChainTypeRoute
+				spec.Hook = nethelpers.ChainHookOutput
+				spec.Priority = nethelpers.ChainPriorityFilter
+				spec.Policy = nethelpers.VerdictAccept
+
+				spec.Rules = []network.NfTablesRule{
+					{
+						MatchMark: &network.NfTablesMark{
+							Mask:  constants.KubeSpanDefaultFirewallMask,
+							Value: constants.KubeSpanDefaultFirewallMark,
+						},
+						Verdict: pointer.To(nethelpers.VerdictAccept),
+					},
+					{
+						MatchOIfName: &network.NfTablesIfNameMatch{
+							InterfaceNames: []string{"lo"},
+						},
+						Verdict: pointer.To(nethelpers.VerdictAccept),
+					},
+					{
+						MatchDestinationAddress: &network.NfTablesAddressMatch{
+							IncludeSubnets: allowedIPsSet.Prefixes(),
+						},
+						ClampMSS: &network.NfTablesClampMSS{
+							MTU: uint16(mtu),
+						},
+					},
+					{
+						MatchDestinationAddress: &network.NfTablesAddressMatch{
+							IncludeSubnets: allowedIPsSet.Prefixes(),
+						},
+						SetMark: &network.NfTablesMark{
+							Mask: ^uint32(constants.KubeSpanDefaultFirewallMask),
+							Xor:  constants.KubeSpanDefaultForceFirewallMark,
+						},
+						Verdict: pointer.To(nethelpers.VerdictAccept),
+					},
+				}
+
+				return nil
+			},
+		); err != nil {
+			return fmt.Errorf("error modifying nftables chain: %w", err)
+		}
+
 		if !updateSpecs {
 			// micro-optimization: skip updating specs if there are no changes to the incoming resources and no endpoint changes
 			r.ResetRestartBackoff()
@@ -384,8 +479,6 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo
 			return fmt.Errorf("error modifying address: %w", err)
 		}
 
-		mtu := cfgSpec.MTU
-
 		for _, spec := range []network.RouteSpecSpec{
 			{
 				Family:      nethelpers.FamilyInet4,
@@ -465,98 +558,6 @@ func (ctrl *ManagerController) Run(ctx context.Context, r controller.Runtime, lo
 			return fmt.Errorf("error modifying link spec: %w", err)
 		}
 
-		if err = safe.WriterModify(ctx, r,
-			network.NewNfTablesChain(
-				network.NamespaceName,
-				"kubespan_prerouting",
-			),
-			func(r *network.NfTablesChain) error {
-				spec := r.TypedSpec()
-
-				spec.Type = nethelpers.ChainTypeFilter
-				spec.Hook = nethelpers.ChainHookPrerouting
-				spec.Priority = nethelpers.ChainPriorityFilter
-				spec.Policy = nethelpers.VerdictAccept
-
-				spec.Rules = []network.NfTablesRule{
-					{
-						MatchMark: &network.NfTablesMark{
-							Mask:  constants.KubeSpanDefaultFirewallMask,
-							Value: constants.KubeSpanDefaultFirewallMark,
-						},
-						Verdict: pointer.To(nethelpers.VerdictAccept),
-					},
-					{
-						MatchDestinationAddress: &network.NfTablesAddressMatch{
-							IncludeSubnets: allowedIPsSet.Prefixes(),
-						},
-						SetMark: &network.NfTablesMark{
-							Mask: ^uint32(constants.KubeSpanDefaultFirewallMask),
-							Xor:  constants.KubeSpanDefaultForceFirewallMark,
-						},
-						Verdict: pointer.To(nethelpers.VerdictAccept),
-					},
-				}
-
-				return nil
-			},
-		); err != nil {
-			return fmt.Errorf("error modifying nftables chain: %w", err)
-		}
-
-		if err = safe.WriterModify(ctx, r,
-			network.NewNfTablesChain(
-				network.NamespaceName,
-				"kubespan_outgoing",
-			),
-			func(r *network.NfTablesChain) error {
-				spec := r.TypedSpec()
-
-				spec.Type = nethelpers.ChainTypeRoute
-				spec.Hook = nethelpers.ChainHookOutput
-				spec.Priority = nethelpers.ChainPriorityFilter
-				spec.Policy = nethelpers.VerdictAccept
-
-				spec.Rules = []network.NfTablesRule{
-					{
-						MatchMark: &network.NfTablesMark{
-							Mask:  constants.KubeSpanDefaultFirewallMask,
-							Value: constants.KubeSpanDefaultFirewallMark,
-						},
-						Verdict: pointer.To(nethelpers.VerdictAccept),
-					},
-					{
-						MatchOIfName: &network.NfTablesIfNameMatch{
-							InterfaceNames: []string{"lo"},
-						},
-						Verdict: pointer.To(nethelpers.VerdictAccept),
-					},
-					{
-						MatchDestinationAddress: &network.NfTablesAddressMatch{
-							IncludeSubnets: allowedIPsSet.Prefixes(),
-						},
-						ClampMSS: &network.NfTablesClampMSS{
-							MTU: uint16(mtu),
-						},
-					},
-					{
-						MatchDestinationAddress: &network.NfTablesAddressMatch{
-							IncludeSubnets: allowedIPsSet.Prefixes(),
-						},
-						SetMark: &network.NfTablesMark{
-							Mask: ^uint32(constants.KubeSpanDefaultFirewallMask),
-							Xor:  constants.KubeSpanDefaultForceFirewallMark,
-						},
-						Verdict: pointer.To(nethelpers.VerdictAccept),
-					},
-				}
-
-				return nil
-			},
-		); err != nil {
-			return fmt.Errorf("error modifying nftables chain: %w", err)
-		}
-
 		if rulesMgr == nil {
 			rulesMgr = ctrl.RulesManagerFactory(constants.KubeSpanDefaultRoutingTable, constants.KubeSpanDefaultForceFirewallMark, constants.KubeSpanDefaultFirewallMask)