diff --git a/controllers/clusterwidenetworkpolicy_controller.go b/controllers/clusterwidenetworkpolicy_controller.go index 3fba5316..864dddcc 100644 --- a/controllers/clusterwidenetworkpolicy_controller.go +++ b/controllers/clusterwidenetworkpolicy_controller.go @@ -181,7 +181,7 @@ func (r *ClusterwideNetworkPolicyReconciler) manageDNSProxy( // DNS Proxy is ON and Firewall machine is rebooted. // // There will be at least 2 problems: -// 1. When it's rebooted, metal-networker will generate basic nftables config and apply it. +// 1. When it's rebooted, os-installer will generate basic nftables config and apply it. // In basic config there's now DNAT rules required for DNS Proxy. // 2. DNS Proxy is started by CWNP controller, and it will not be started until some CWNP resource is created/updated/deleted. func (r *ClusterwideNetworkPolicyReconciler) getReconciliationTicker(scheduleChan chan<- event.TypedGenericEvent[*firewallv1.ClusterwideNetworkPolicy]) manager.RunnableFunc { diff --git a/go.mod b/go.mod index 75f9fb69..e77b4163 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/metal-stack/firewall-controller-manager v0.6.1 github.com/metal-stack/metal-go v0.43.3 github.com/metal-stack/metal-lib v0.25.1 - github.com/metal-stack/metal-networker v0.47.0 + github.com/metal-stack/os-installer v0.2.1-0.20260619073856-4bde2f536e04 github.com/metal-stack/v v1.0.3 github.com/miekg/dns v1.1.72 github.com/stretchr/testify v1.11.1 @@ -69,7 +69,6 @@ require ( github.com/mattn/go-isatty v0.0.22 // indirect github.com/mdlayher/netlink v1.11.2 // indirect github.com/mdlayher/socket v0.6.1 // indirect - github.com/metal-stack/metal-hammer v0.13.17 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect diff --git a/go.sum b/go.sum index ac607161..ab567d87 100644 --- a/go.sum +++ b/go.sum @@ -128,12 +128,10 @@ github.com/metal-stack/firewall-controller-manager v0.6.1 h1:JM5oCuye9GBY/QivK9q github.com/metal-stack/firewall-controller-manager v0.6.1/go.mod h1:bQjb3pVL3R6XPUqWA/WX8ktlzcgVYWDbsFANKcrW3FA= github.com/metal-stack/metal-go v0.43.3 h1:I6N+sea97ICBy/p4ZVGmca3MWV7bvGT5rY3JPnEuW0M= github.com/metal-stack/metal-go v0.43.3/go.mod h1:GSfXrAj55LGsUSMHWGDsmq5n056NG0yb1JM8bgfvKOw= -github.com/metal-stack/metal-hammer v0.13.17 h1:W2IrWmnz6IXpL7Y35RfVgSVO66EVdqeF+/WeopgycMI= -github.com/metal-stack/metal-hammer v0.13.17/go.mod h1:N+AEexkInMf1YHe40CkCSaAK4mkKh8ubB3Zsy1s6uzQ= github.com/metal-stack/metal-lib v0.25.1 h1:z14xNl59ueQavNvMG4wcIZGqVyosNlaNFcy8hUu3SCU= github.com/metal-stack/metal-lib v0.25.1/go.mod h1:FWviUPM7oH1CnmCwkyLjWpd3yuzf6NnR97Xf45P2/Fk= -github.com/metal-stack/metal-networker v0.47.0 h1:DsA7cLfcd/LtTv+bMqCX7a+uGRB4cTbNAguBu0EHNvI= -github.com/metal-stack/metal-networker v0.47.0/go.mod h1:IoxAZQXAc4h5mFGqSKOo7EAp7pYr+qK2B6qgf3kBu+U= +github.com/metal-stack/os-installer v0.2.1-0.20260619073856-4bde2f536e04 h1:KW+hhQAoYAgyTtv+x85gl5+aa7B96hF+UoAEcoWv7iU= +github.com/metal-stack/os-installer v0.2.1-0.20260619073856-4bde2f536e04/go.mod h1:DIkBi59VCwaTfp2OLmtOuZOrxPRLT9ElGZTKCk5aB2M= github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs= github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= diff --git a/pkg/dns/dnsproxy.go b/pkg/dns/dnsproxy.go index b9a16212..76592923 100644 --- a/pkg/dns/dnsproxy.go +++ b/pkg/dns/dnsproxy.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/metal-stack/metal-networker/pkg/netconf" + netconf "github.com/metal-stack/os-installer/pkg/network" "sigs.k8s.io/controller-runtime/pkg/client" firewallv1 "github.com/metal-stack/firewall-controller/v2/api/v1" diff --git a/pkg/network/network.go b/pkg/network/network.go index c2306371..b416de25 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -9,7 +9,7 @@ import ( "github.com/Masterminds/semver/v3" firewallv2 "github.com/metal-stack/firewall-controller-manager/api/v2" "github.com/metal-stack/metal-go/api/models" - "github.com/metal-stack/metal-networker/pkg/netconf" + netconf "github.com/metal-stack/os-installer/pkg/network" ) const ( diff --git a/pkg/nftables/firewall.go b/pkg/nftables/firewall.go index 9dbdab84..6ba3693d 100644 --- a/pkg/nftables/firewall.go +++ b/pkg/nftables/firewall.go @@ -10,6 +10,7 @@ import ( "path/filepath" "github.com/metal-stack/firewall-controller/v2/pkg/dns" + netconf "github.com/metal-stack/os-installer/pkg/network" "github.com/metal-stack/firewall-controller/v2/pkg/network" @@ -20,7 +21,6 @@ import ( "k8s.io/client-go/tools/record" mn "github.com/metal-stack/metal-lib/pkg/net" - "github.com/metal-stack/metal-networker/pkg/netconf" firewallv2 "github.com/metal-stack/firewall-controller-manager/api/v2" firewallv1 "github.com/metal-stack/firewall-controller/v2/api/v1"