Skip to content

Commit

Permalink
Update metal-networker with more ipv6 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 committed Dec 11, 2024
1 parent dbbd0c0 commit 0fba365
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 93 deletions.
6 changes: 3 additions & 3 deletions api/v1/clusterwidenetworkpolicy_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,20 @@ func (l *ClusterwideNetworkPolicyList) GetFQDNs() []FQDNSelector {
return s
}

func (s FQDNSelector) GetName() string {
func (s *FQDNSelector) GetName() string {
if s.MatchName != "" {
return s.MatchName
}

return s.MatchPattern
}

func (s FQDNSelector) GetMatchName() string {
func (s *FQDNSelector) GetMatchName() string {
return dnsgo.Fqdn(s.MatchName)
}

// GetRegex converts a MatchPattern into a regexp string
func (s FQDNSelector) GetRegex() string {
func (s *FQDNSelector) GetRegex() string {
// Handle "*" as match-all case
if s.MatchPattern == "*" {
return "(^(" + allowedDNSCharsREGroup + "+[.])+$)|(^[.]$)"
Expand Down
53 changes: 28 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
module github.com/metal-stack/firewall-controller/v2

go 1.23
go 1.23.0

toolchain go1.23.4

require (
github.com/coreos/go-systemd/v22 v22.5.0
github.com/fatih/color v1.17.0
github.com/fatih/color v1.18.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806
github.com/ks2211/go-suricata v0.0.0-20200823200910-986ce1470707
github.com/metal-stack/firewall-controller-manager v0.4.3
github.com/metal-stack/metal-go v0.37.2
github.com/metal-stack/metal-lib v0.18.4
github.com/metal-stack/metal-networker v0.45.2
github.com/metal-stack/metal-go v0.39.4
github.com/metal-stack/metal-lib v0.19.0
github.com/metal-stack/metal-networker v0.45.3
github.com/metal-stack/v v1.0.3
github.com/miekg/dns v1.1.62
github.com/txn2/txeh v1.5.5
github.com/vishvananda/netlink v1.3.0
go.uber.org/mock v0.4.0
go.uber.org/mock v0.5.0
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
k8s.io/api v0.29.3
k8s.io/apiextensions-apiserver v0.29.3
Expand All @@ -29,14 +31,14 @@ require (
replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.3

require (
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/semver/v3 v3.3.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand All @@ -46,6 +48,7 @@ require (
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -57,13 +60,13 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
github.com/mdlayher/socket v0.5.1 // indirect
github.com/metal-stack/metal-hammer v0.13.5 // indirect
github.com/metal-stack/metal-hammer v0.13.10 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -72,25 +75,25 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.mongodb.org/mongo-driver v1.16.1 // indirect
github.com/spf13/viper v1.20.0-alpha.6 // indirect
github.com/vishvananda/netns v0.0.5 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 0fba365

Please sign in to comment.