with snat functionality the k8s firewall object contains the metal ne…

…tworks and can extract service and the private vrf by its own (#35)
metal-stack · Nov 17, 2020 · 64ef18b · 64ef18b
1 parent dd2858a
commit 64ef18b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/internal/netconf/firewall_controller.go b/internal/netconf/firewall_controller.go
@@ -30,13 +30,9 @@ func NewFirewallControllerServiceApplier(kb KnowledgeBase, v net.Validator) (net
 	if len(kb.getPrivatePrimaryNetwork().Ips) == 0 {
 		return nil, fmt.Errorf("no private IP found useable for the firewall controller")
 	}
-	serviceIP := kb.getPrivatePrimaryNetwork().Ips[0]
-	privateVrfID := kb.getPrivatePrimaryNetwork().Vrf
 	data := FirewallControllerData{
 		Comment:         versionHeader(kb.Machineuuid),
 		DefaultRouteVrf: defaultRouteVrf,
-		ServiceIP:       serviceIP,
-		PrivateVrfID:    *privateVrfID,
 	}
 
 	return net.NewNetworkApplier(data, v, nil), nil

diff --git a/internal/netconf/testdata/firewall-controller.service b/internal/netconf/testdata/firewall-controller.service
@@ -7,7 +7,7 @@ After=network.target
 [Service]
 LimitMEMLOCK=infinity
 Environment=KUBECONFIG=/etc/firewall-controller/.kubeconfig
-ExecStart=/bin/ip vrf exec vrf104009 /usr/local/bin/firewall-controller --service-ip 10.0.16.2 --private-vrf 3981
+ExecStart=/bin/ip vrf exec vrf104009 /usr/local/bin/firewall-controller
 Restart=always
 RestartSec=10
 

diff --git a/internal/netconf/tpl/firewall_controller.service.tpl b/internal/netconf/tpl/firewall_controller.service.tpl
@@ -7,7 +7,7 @@ After=network.target
 [Service]
 LimitMEMLOCK=infinity
 Environment=KUBECONFIG=/etc/firewall-controller/.kubeconfig
-ExecStart=/bin/ip vrf exec {{ .DefaultRouteVrf }} /usr/local/bin/firewall-controller --service-ip {{ .ServiceIP }} --private-vrf {{ .PrivateVrfID }}
+ExecStart=/bin/ip vrf exec {{ .DefaultRouteVrf }} /usr/local/bin/firewall-controller
 Restart=always
 RestartSec=10