Skip to content

Commit b38b746

Browse files
majst01majst01
authored
Update metal-networker with more ipv6 compatibility (#192)
* Update metal-networker with more ipv6 compatibility * Fix typos
1 parent dbbd0c0 commit b38b746

File tree

6 files changed

+95
-96
lines changed

6 files changed

+95
-96
lines changed

‎api/v1/clusterwidenetworkpolicy_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,20 +171,20 @@ func (l *ClusterwideNetworkPolicyList) GetFQDNs() []FQDNSelector {
171171
return s
172172
}
173173

174-
func (s FQDNSelector) GetName() string {
174+
func (s *FQDNSelector) GetName() string {
175175
if s.MatchName != "" {
176176
return s.MatchName
177177
}
178178

179179
return s.MatchPattern
180180
}
181181

182-
func (s FQDNSelector) GetMatchName() string {
182+
func (s *FQDNSelector) GetMatchName() string {
183183
return dnsgo.Fqdn(s.MatchName)
184184
}
185185

186186
// GetRegex converts a MatchPattern into a regexp string
187-
func (s FQDNSelector) GetRegex() string {
187+
func (s *FQDNSelector) GetRegex() string {
188188
// Handle "*" as match-all case
189189
if s.MatchPattern == "*" {
190190
return "(^(" + allowedDNSCharsREGroup + "+[.])+$)|(^[.]$)"

‎controllers/clusterwidenetworkpolicy_validation_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (r *ClusterwideNetworkPolicyValidationReconciler) Reconcile(ctx context.Con
3737
r.Recorder.Event(
3838
&clusterNP,
3939
corev1.EventTypeWarning,
40-
"Unapplicable",
40+
"Inapplicable",
4141
fmt.Sprintf("cluster wide network policies must be defined in namespace %s otherwise they won't take effect", firewallv1.ClusterwideNetworkPolicyNamespace),
4242
)
4343
return ctrl.Result{}, nil
@@ -48,7 +48,7 @@ func (r *ClusterwideNetworkPolicyValidationReconciler) Reconcile(ctx context.Con
4848
r.Recorder.Event(
4949
&clusterNP,
5050
corev1.EventTypeWarning,
51-
"Unapplicable",
51+
"Inapplicable",
5252
fmt.Sprintf("cluster wide network policy is not valid: %v", err),
5353
)
5454
return ctrl.Result{}, nil

‎controllers/firewall_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (r *FirewallReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
144144

145145
r.SeedUpdatedFunc()
146146

147-
r.Log.Info("successfully reconciled firewall, requeueing in 3 minutes")
147+
r.Log.Info("successfully reconciled firewall, requeuing in 3 minutes")
148148

149149
return ctrl.Result{
150150
RequeueAfter: 3 * time.Minute,

‎go.mod‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
module github.com/metal-stack/firewall-controller/v2
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/coreos/go-systemd/v22 v22.5.0
7-
github.com/fatih/color v1.17.0
9+
github.com/fatih/color v1.18.0
810
github.com/go-logr/logr v1.4.2
911
github.com/google/go-cmp v0.6.0
1012
github.com/google/nftables v0.2.1-0.20240414091927-5e242ec57806
1113
github.com/ks2211/go-suricata v0.0.0-20200823200910-986ce1470707
1214
github.com/metal-stack/firewall-controller-manager v0.4.3
13-
github.com/metal-stack/metal-go v0.37.2
14-
github.com/metal-stack/metal-lib v0.18.4
15-
github.com/metal-stack/metal-networker v0.45.2
15+
github.com/metal-stack/metal-go v0.39.4
16+
github.com/metal-stack/metal-lib v0.19.0
17+
github.com/metal-stack/metal-networker v0.45.3
1618
github.com/metal-stack/v v1.0.3
1719
github.com/miekg/dns v1.1.62
1820
github.com/txn2/txeh v1.5.5
1921
github.com/vishvananda/netlink v1.3.0
20-
go.uber.org/mock v0.4.0
22+
go.uber.org/mock v0.5.0
2123
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
2224
k8s.io/api v0.29.3
2325
k8s.io/apiextensions-apiserver v0.29.3
@@ -29,14 +31,14 @@ require (
2931
replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
3032

3133
require (
32-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
34+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
3335
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3436
github.com/beorn7/perks v1.0.1 // indirect
3537
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3638
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3739
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3840
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
39-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/fsnotify/fsnotify v1.8.0 // indirect
4042
github.com/go-openapi/analysis v0.23.0 // indirect
4143
github.com/go-openapi/errors v0.22.0 // indirect
4244
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -46,6 +48,7 @@ require (
4648
github.com/go-openapi/strfmt v0.23.0 // indirect
4749
github.com/go-openapi/swag v0.23.0 // indirect
4850
github.com/go-openapi/validate v0.24.0 // indirect
51+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
4952
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
5053
github.com/gogo/protobuf v1.3.2 // indirect
5154
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -57,13 +60,13 @@ require (
5760
github.com/josharian/intern v1.0.0 // indirect
5861
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
5962
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/klauspost/compress v1.17.9 // indirect
63+
github.com/klauspost/compress v1.17.11 // indirect
6164
github.com/mailru/easyjson v0.7.7 // indirect
6265
github.com/mattn/go-colorable v0.1.13 // indirect
6366
github.com/mattn/go-isatty v0.0.20 // indirect
6467
github.com/mdlayher/netlink v1.7.2 // indirect
6568
github.com/mdlayher/socket v0.5.1 // indirect
66-
github.com/metal-stack/metal-hammer v0.13.5 // indirect
69+
github.com/metal-stack/metal-hammer v0.13.10 // indirect
6770
github.com/mitchellh/mapstructure v1.5.0 // indirect
6871
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6972
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -72,25 +75,25 @@ require (
7275
github.com/pkg/errors v0.9.1 // indirect
7376
github.com/prometheus/client_golang v1.20.5 // indirect
7477
github.com/prometheus/client_model v0.6.1 // indirect
75-
github.com/prometheus/common v0.60.0 // indirect
78+
github.com/prometheus/common v0.61.0 // indirect
7679
github.com/prometheus/procfs v0.15.1 // indirect
77-
github.com/sagikazarmark/locafero v0.6.0 // indirect
7880
github.com/spf13/pflag v1.0.5 // indirect
79-
github.com/vishvananda/netns v0.0.4 // indirect
80-
go.mongodb.org/mongo-driver v1.16.1 // indirect
81+
github.com/spf13/viper v1.20.0-alpha.6 // indirect
82+
github.com/vishvananda/netns v0.0.5 // indirect
83+
go.mongodb.org/mongo-driver v1.17.1 // indirect
8184
go.uber.org/zap v1.27.0 // indirect
82-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
83-
golang.org/x/mod v0.21.0 // indirect
84-
golang.org/x/net v0.30.0 // indirect
85-
golang.org/x/oauth2 v0.23.0 // indirect
86-
golang.org/x/sync v0.8.0 // indirect
87-
golang.org/x/sys v0.26.0 // indirect
88-
golang.org/x/term v0.25.0 // indirect
89-
golang.org/x/text v0.19.0 // indirect
90-
golang.org/x/time v0.7.0 // indirect
91-
golang.org/x/tools v0.26.0 // indirect
85+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
86+
golang.org/x/mod v0.22.0 // indirect
87+
golang.org/x/net v0.32.0 // indirect
88+
golang.org/x/oauth2 v0.24.0 // indirect
89+
golang.org/x/sync v0.10.0 // indirect
90+
golang.org/x/sys v0.28.0 // indirect
91+
golang.org/x/term v0.27.0 // indirect
92+
golang.org/x/text v0.21.0 // indirect
93+
golang.org/x/time v0.8.0 // indirect
94+
golang.org/x/tools v0.28.0 // indirect
9295
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
93-
google.golang.org/protobuf v1.35.1 // indirect
96+
google.golang.org/protobuf v1.35.2 // indirect
9497
gopkg.in/inf.v0 v0.9.1 // indirect
9598
gopkg.in/yaml.v2 v2.4.0 // indirect
9699
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)