Skip to content

Commit ac55a19

Browse files
majst01majst01
authored
Go 1.26 (#213)
1 parent b2e7436 commit ac55a19

22 files changed

Lines changed: 449 additions & 345 deletions

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: google-github-actions/setup-gcloud@v3
4141

4242
- name: Set up Go
43-
uses: actions/setup-go@v5
43+
uses: actions/setup-go@v6
4444
with:
4545
go-version-file: 'go.mod'
4646
cache: false
@@ -108,7 +108,7 @@ jobs:
108108
- uses: actions/checkout@v6
109109

110110
- name: Set up Go
111-
uses: actions/setup-go@v5
111+
uses: actions/setup-go@v6
112112
with:
113113
go-version-file: 'go.mod'
114114
cache: false

‎.mockery.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
all: true
3+
recursive: true
4+
include-auto-generated: true
5+
dir: 'pkg/nftables/mocks/{{.InterfaceDirRelative | trimPrefix "go/"}}'
6+
filename: "{{.InterfaceName}}.go"
7+
pkgname: '{{.SrcPackageName}}'
8+
structname: '{{.InterfaceName}}'
9+
packages:
10+
github.com/metal-stack/firewall-controller/v2/pkg/nftables:

‎Makefile‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ vet:
6464
go vet ./...
6565

6666
# Generate code
67-
generate: controller-gen mockery manifests
67+
generate: controller-gen go-mocks manifests
6868
$(CONTROLLER_GEN) object paths="./..."
6969
go generate ./...
7070

@@ -79,7 +79,14 @@ setup-envtest: $(ENVTEST)
7979
$(ENVTEST): $(LOCALBIN)
8080
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
8181

82-
.PHONY: mockery
83-
mockery: $(MOCKERY)
84-
$(MOCKERY): $(LOCALBIN)
85-
test -s $(LOCALBIN)/mockery || GOBIN=$(LOCALBIN) go install github.com/vektra/mockery/v2@latest
82+
.PHONY: go-mocks
83+
go-mocks:
84+
# we remove files explicitly to ensure files really get generated
85+
rm -rf pkg/nftables/mocks
86+
87+
docker run --rm \
88+
--user $$(id -u):$$(id -g) \
89+
--tmpfs /.cache:uid=$$(id -u),gid=$$(id -g) \
90+
-w /work \
91+
-v ${PWD}:/work \
92+
vektra/mockery:v3.6.4

‎api/v1/clusterwidenetworkpolicy_types_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ func TestPolicySpec_Validate(t *testing.T) {
9797
},
9898
}
9999
for _, tt := range tests {
100-
tt := tt
101100
t.Run(tt.name, func(t *testing.T) {
102101
p := &PolicySpec{
103102
Ingress: tt.Ingress,
@@ -146,7 +145,6 @@ func TestFQDNSelector_GetRegex(t *testing.T) {
146145
},
147146
}
148147
for _, tt := range tests {
149-
tt := tt
150148
t.Run(tt.name, func(t *testing.T) {
151149
if r := tt.selector.GetRegex(); tt.expectedRegex != r {
152150
t.Errorf("FQDNSelector.GetRegex returned %s, expected %s", r, tt.expectedRegex)

‎controllers/firewall_controller.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ func (r *FirewallReconciler) reconcileFirewallService(ctx context.Context, s fir
236236

237237
var privateNet *firewallv2.FirewallNetwork
238238
for _, n := range f.Status.FirewallNetworks {
239-
n := n
240239
if n.NetworkType == nil {
241240
continue
242241
}

‎controllers/firewall_controller_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ func TestConvert(t *testing.T) {
125125
},
126126
}
127127
for _, tc := range tt {
128-
tc := tc
129128
t.Run(tc.name, func(t *testing.T) {
130129
actualCwnp, actualErr := convert(tc.np)
131130
if !errors.Is(actualErr, tc.expectedErr) {

‎go.mod‎

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

3-
go 1.25.0
3+
go 1.26
44

55
require (
66
github.com/Masterminds/semver/v3 v3.4.0
7-
github.com/coreos/go-systemd/v22 v22.6.0
7+
github.com/coreos/go-systemd/v22 v22.7.0
88
github.com/fatih/color v1.18.0
99
github.com/go-logr/logr v1.4.3
1010
github.com/google/go-cmp v0.7.0
1111
github.com/google/nftables v0.3.0
1212
github.com/ks2211/go-suricata v0.0.0-20200823200910-986ce1470707
13-
github.com/metal-stack/firewall-controller-manager v0.5.1
14-
github.com/metal-stack/metal-go v0.42.5
15-
github.com/metal-stack/metal-lib v0.23.5
16-
github.com/metal-stack/metal-networker v0.46.2
13+
github.com/metal-stack/firewall-controller-manager v0.6.0
14+
github.com/metal-stack/metal-go v0.43.0
15+
github.com/metal-stack/metal-lib v0.24.0
16+
github.com/metal-stack/metal-networker v0.46.3
1717
github.com/metal-stack/v v1.0.3
1818
github.com/miekg/dns v1.1.72
1919
github.com/stretchr/testify v1.11.1
20-
github.com/txn2/txeh v1.7.0
20+
github.com/txn2/txeh v1.8.0
2121
github.com/vishvananda/netlink v1.3.1
2222
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
23-
k8s.io/api v0.34.0
24-
k8s.io/apiextensions-apiserver v0.34.0
25-
k8s.io/apimachinery v0.34.0
26-
k8s.io/client-go v0.34.0
27-
sigs.k8s.io/controller-runtime v0.22.0
23+
k8s.io/api v0.35.0
24+
k8s.io/apiextensions-apiserver v0.35.0
25+
k8s.io/apimachinery v0.35.0
26+
k8s.io/client-go v0.35.0
27+
sigs.k8s.io/controller-runtime v0.23.0
2828
sigs.k8s.io/yaml v1.6.0
2929
)
3030

@@ -39,68 +39,66 @@ require (
3939
github.com/fsnotify/fsnotify v1.9.0 // indirect
4040
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4141
github.com/go-openapi/analysis v0.24.2 // indirect
42-
github.com/go-openapi/errors v0.22.6 // indirect
43-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
44-
github.com/go-openapi/jsonreference v0.21.4 // indirect
42+
github.com/go-openapi/errors v0.22.7 // indirect
43+
github.com/go-openapi/jsonpointer v0.22.5 // indirect
44+
github.com/go-openapi/jsonreference v0.21.5 // indirect
4545
github.com/go-openapi/loads v0.23.2 // indirect
46-
github.com/go-openapi/spec v0.22.3 // indirect
46+
github.com/go-openapi/spec v0.22.4 // indirect
4747
github.com/go-openapi/strfmt v0.25.0 // indirect
48-
github.com/go-openapi/swag v0.25.4 // indirect
49-
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
50-
github.com/go-openapi/swag/conv v0.25.4 // indirect
51-
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
52-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
53-
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
54-
github.com/go-openapi/swag/loading v0.25.4 // indirect
55-
github.com/go-openapi/swag/mangling v0.25.4 // indirect
56-
github.com/go-openapi/swag/netutils v0.25.4 // indirect
57-
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
58-
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
59-
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
48+
github.com/go-openapi/swag v0.25.5 // indirect
49+
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
50+
github.com/go-openapi/swag/conv v0.25.5 // indirect
51+
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
52+
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
53+
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
54+
github.com/go-openapi/swag/loading v0.25.5 // indirect
55+
github.com/go-openapi/swag/mangling v0.25.5 // indirect
56+
github.com/go-openapi/swag/netutils v0.25.5 // indirect
57+
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
58+
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
59+
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
6060
github.com/go-openapi/validate v0.25.1 // indirect
6161
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
6262
github.com/godbus/dbus/v5 v5.2.2 // indirect
63-
github.com/gogo/protobuf v1.3.2 // indirect
6463
github.com/google/btree v1.1.3 // indirect
6564
github.com/google/gnostic-models v0.7.1 // indirect
6665
github.com/google/uuid v1.6.0 // indirect
6766
github.com/json-iterator/go v1.1.12 // indirect
68-
github.com/klauspost/compress v1.18.3 // indirect
67+
github.com/klauspost/compress v1.18.4 // indirect
6968
github.com/kr/text v0.2.0 // indirect
7069
github.com/mattn/go-colorable v0.1.14 // indirect
7170
github.com/mattn/go-isatty v0.0.20 // indirect
72-
github.com/mdlayher/netlink v1.8.0 // indirect
71+
github.com/mdlayher/netlink v1.9.0 // indirect
7372
github.com/mdlayher/socket v0.5.1 // indirect
7473
github.com/metal-stack/metal-hammer v0.13.17 // indirect
7574
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7675
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7776
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7877
github.com/oklog/ulid v1.3.1 // indirect
79-
github.com/pkg/errors v0.9.1 // indirect
8078
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8179
github.com/prometheus/client_golang v1.23.2 // indirect
8280
github.com/prometheus/client_model v0.6.2 // indirect
8381
github.com/prometheus/common v0.67.5 // indirect
84-
github.com/prometheus/procfs v0.19.2 // indirect
82+
github.com/prometheus/procfs v0.20.1 // indirect
8583
github.com/spf13/pflag v1.0.10 // indirect
86-
github.com/stretchr/objx v0.5.2 // indirect
84+
github.com/stretchr/objx v0.5.3 // indirect
8785
github.com/vishvananda/netns v0.0.5 // indirect
8886
github.com/x448/float16 v0.8.4 // indirect
89-
go.mongodb.org/mongo-driver v1.17.7 // indirect
87+
go.mongodb.org/mongo-driver v1.17.9 // indirect
9088
go.yaml.in/yaml/v2 v2.4.3 // indirect
9189
go.yaml.in/yaml/v3 v3.0.4 // indirect
92-
golang.org/x/mod v0.32.0 // indirect
93-
golang.org/x/net v0.49.0 // indirect
94-
golang.org/x/oauth2 v0.34.0 // indirect
90+
golang.org/x/mod v0.33.0 // indirect
91+
golang.org/x/net v0.51.0 // indirect
92+
golang.org/x/oauth2 v0.35.0 // indirect
9593
golang.org/x/sync v0.19.0 // indirect
96-
golang.org/x/sys v0.40.0 // indirect
97-
golang.org/x/term v0.39.0 // indirect
98-
golang.org/x/text v0.33.0 // indirect
94+
golang.org/x/sys v0.41.0 // indirect
95+
golang.org/x/term v0.40.0 // indirect
96+
golang.org/x/text v0.34.0 // indirect
9997
golang.org/x/time v0.14.0 // indirect
100-
golang.org/x/tools v0.41.0 // indirect
98+
golang.org/x/tools v0.42.0 // indirect
10199
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
102100
google.golang.org/protobuf v1.36.11 // indirect
103-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
101+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
104102
gopkg.in/inf.v0 v0.9.1 // indirect
105103
gopkg.in/yaml.v3 v3.0.1 // indirect
106104
k8s.io/klog/v2 v2.130.1 // indirect

0 commit comments

Comments
 (0)