Skip to content

use os-installer@fix-external-dns #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mwennrich wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

use os-installer@fix-external-dns #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df3f2c6
use os-installer@fix-external-dns
mwennrich Jun 19, 2026
45abb8f
fix
mwennrich Jun 19, 2026
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
2 changes: 1 addition & 1 deletion controllers/clusterwidenetworkpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/dns/dnsproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/nftables/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down