Skip to content

Commit 45bdf0b

Browse files
oshovaloshoval
authored
Revert "Bump Go to 1.24.2 and golangci-lint (#421)" (#423)
This reverts commit 7761d9b. Signed-off-by: Or Shoval <oshoval@redhat.com>
1 parent 7761d9b commit 45bdf0b

File tree

987 files changed

+30063
-95333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

987 files changed

+30063
-95333
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ TLS_SETTING := $(if $(filter $(OCI_BIN),podman),--tls-verify=false,)
2828
GO_BUILD_OPTS ?= CGO_ENABLED=0 GO111MODULE=on
2929
GO_TAGS ?= -tags no_openssl
3030
GO_FLAGS ?= -mod vendor
31-
GOLANGCI_LINT_VERSION ?= v2.7.2
3231

3332
all: lint build
3433

@@ -43,7 +42,7 @@ $(BASE): ; $(info setting GOPATH...)
4342

4443
GOLANGCI = $(GOBIN)/golangci-lint
4544
$(GOBIN)/golangci-lint: $(GO) | $(BASE) ; $(info building golangci-lint...)
46-
$Q $(GO) install -mod=mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
45+
$Q $(GO) install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.6
4746

4847
build: format $(patsubst %, build-%, $(COMPONENTS))
4948

‎cmd/marker/main.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/util/wait"
2727

2828
"github.com/golang/glog"
29-
3029
"github.com/k8snetworkplumbingwg/ovs-cni/pkg/cache"
3130
"github.com/k8snetworkplumbingwg/ovs-cni/pkg/marker"
3231
)
@@ -99,6 +98,7 @@ func main() {
9998
if err != nil {
10099
glog.Fatalf("Update failed: %v", err)
101100
}
101+
102102
}, time.Duration(*updateInterval)*time.Second, 1.2, true, wait.NeverStop)
103103
}
104104

@@ -110,7 +110,7 @@ func keepAlive(healthCheckFile string, healthCheckInterval int) {
110110
if err != nil {
111111
glog.Fatalf("failed to create file: %s, err: %v", healthCheckFile, err)
112112
}
113-
defer func() { _ = file.Close() }()
113+
defer file.Close()
114114
} else {
115115
currentTime := time.Now().Local()
116116
err = os.Chtimes(healthCheckFile, currentTime, currentTime)
@@ -119,6 +119,7 @@ func keepAlive(healthCheckFile string, healthCheckInterval int) {
119119
healthCheckFile, err)
120120
}
121121
}
122+
122123
}, time.Duration(healthCheckInterval)*time.Second)
123124
}
124125

@@ -192,9 +193,7 @@ func validateOvsTcpConnection(address string) error {
192193
conn, err := net.DialTimeout(TcpSocketType, address, SocketConnectionTimeout)
193194
if err == nil {
194195
glog.Info("Successfully connected to TCP socket")
195-
if err := conn.Close(); err != nil {
196-
return fmt.Errorf("failed to close TCP connection to %s: %v", address, err)
197-
}
196+
conn.Close()
198197
return nil
199198
}
200199

‎go.mod‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
module github.com/k8snetworkplumbingwg/ovs-cni
22

3-
go 1.25.3
4-
53
require (
6-
dario.cat/mergo v1.0.2
7-
github.com/containernetworking/cni v1.3.0
8-
github.com/containernetworking/plugins v1.8.0
4+
dario.cat/mergo v1.0.0
5+
github.com/containernetworking/cni v1.2.3
6+
github.com/containernetworking/plugins v1.5.1
97
github.com/golang/glog v1.2.4
108
github.com/j-keck/arping v1.0.3
119
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
@@ -15,9 +13,9 @@ require (
1513
github.com/ovn-org/libovsdb v0.7.0
1614
github.com/pkg/errors v0.9.1
1715
github.com/vishvananda/netlink v1.3.1
18-
k8s.io/api v0.34.3
19-
k8s.io/apimachinery v0.34.3
20-
k8s.io/client-go v0.34.3
16+
k8s.io/api v0.32.0
17+
k8s.io/apimachinery v0.32.0
18+
k8s.io/client-go v0.32.0
2119
kubevirt.io/qe-tools v0.1.8
2220
)
2321

@@ -28,10 +26,10 @@ require (
2826
github.com/cenkalti/hub v1.0.1 // indirect
2927
github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
3028
github.com/cespare/xxhash/v2 v2.1.2 // indirect
31-
github.com/coreos/go-iptables v0.8.0 // indirect
29+
github.com/coreos/go-iptables v0.7.0 // indirect
3230
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
34-
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
31+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
32+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3533
github.com/go-logr/logr v1.4.3 // indirect
3634
github.com/go-logr/stdr v1.2.2 // indirect
3735
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -40,32 +38,32 @@ require (
4038
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4139
github.com/gogo/protobuf v1.3.2 // indirect
4240
github.com/golang/protobuf v1.5.4 // indirect
43-
github.com/google/gnostic-models v0.7.0 // indirect
41+
github.com/google/gnostic-models v0.6.8 // indirect
4442
github.com/google/go-cmp v0.7.0 // indirect
45-
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
43+
github.com/google/gofuzz v1.2.0 // indirect
44+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4645
github.com/google/uuid v1.6.0 // indirect
47-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
46+
github.com/gorilla/websocket v1.5.0 // indirect
4847
github.com/josharian/intern v1.0.0 // indirect
4948
github.com/json-iterator/go v1.1.12 // indirect
5049
github.com/mailru/easyjson v0.7.7 // indirect
5150
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
5251
github.com/moby/spdystream v0.5.0 // indirect
5352
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
54-
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
53+
github.com/modern-go/reflect2 v1.0.2 // indirect
5554
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5655
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5756
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5857
github.com/prometheus/client_golang v1.12.1 // indirect
5958
github.com/prometheus/client_model v0.2.0 // indirect
6059
github.com/prometheus/common v0.32.1 // indirect
6160
github.com/prometheus/procfs v0.7.3 // indirect
62-
github.com/safchain/ethtool v0.6.2 // indirect
61+
github.com/safchain/ethtool v0.4.0 // indirect
6362
github.com/spf13/afero v1.9.4 // indirect
64-
github.com/spf13/pflag v1.0.6 // indirect
65-
github.com/stretchr/testify v1.10.0 // indirect
63+
github.com/spf13/pflag v1.0.5 // indirect
64+
github.com/stretchr/testify v1.9.0 // indirect
6665
github.com/vishvananda/netns v0.0.5 // indirect
6766
github.com/x448/float16 v0.8.4 // indirect
68-
go.yaml.in/yaml/v2 v2.4.2 // indirect
6967
go.yaml.in/yaml/v3 v3.0.4 // indirect
7068
golang.org/x/mod v0.27.0 // indirect
7169
golang.org/x/net v0.43.0 // indirect
@@ -74,42 +72,42 @@ require (
7472
golang.org/x/sys v0.35.0 // indirect
7573
golang.org/x/term v0.34.0 // indirect
7674
golang.org/x/text v0.28.0 // indirect
77-
golang.org/x/time v0.9.0 // indirect
75+
golang.org/x/time v0.7.0 // indirect
7876
golang.org/x/tools v0.36.0 // indirect
7977
google.golang.org/protobuf v1.36.7 // indirect
8078
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8179
gopkg.in/inf.v0 v0.9.1 // indirect
8280
gopkg.in/yaml.v3 v3.0.1 // indirect
8381
k8s.io/klog/v2 v2.130.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
85-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
86-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
87-
sigs.k8s.io/knftables v0.0.18 // indirect
88-
sigs.k8s.io/randfill v1.0.0 // indirect
89-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
90-
sigs.k8s.io/yaml v1.6.0 // indirect
82+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
83+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
84+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
85+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
86+
sigs.k8s.io/yaml v1.4.0 // indirect
9187
)
9288

9389
replace (
94-
k8s.io/api => k8s.io/api v0.34.3
95-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.3
96-
k8s.io/apimachinery => k8s.io/apimachinery v0.34.3
97-
k8s.io/apiserver => k8s.io/apiserver v0.34.3
98-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.3
99-
k8s.io/client-go => k8s.io/client-go v0.34.3
100-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.3
101-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.3
102-
k8s.io/code-generator => k8s.io/code-generator v0.34.3
103-
k8s.io/component-base => k8s.io/component-base v0.34.3
104-
k8s.io/cri-api => k8s.io/cri-api v0.34.3
105-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.3
106-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.3
107-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.3
108-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.3
109-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.3
110-
k8s.io/kubectl => k8s.io/kubectl v0.34.3
111-
k8s.io/kubelet => k8s.io/kubelet v0.34.3
112-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.3
113-
k8s.io/metrics => k8s.io/metrics v0.34.3
114-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.3
90+
k8s.io/api => k8s.io/api v0.32.0
91+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
92+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
93+
k8s.io/apiserver => k8s.io/apiserver v0.32.0
94+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
95+
k8s.io/client-go => k8s.io/client-go v0.32.0
96+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0
97+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0
98+
k8s.io/code-generator => k8s.io/code-generator v0.32.0
99+
k8s.io/component-base => k8s.io/component-base v0.32.0
100+
k8s.io/cri-api => k8s.io/cri-api v0.32.0
101+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0
102+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0
103+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0
104+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0
105+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0
106+
k8s.io/kubectl => k8s.io/kubectl v0.32.0
107+
k8s.io/kubelet => k8s.io/kubelet v0.32.0
108+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
109+
k8s.io/metrics => k8s.io/metrics v0.32.0
110+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
115111
)
112+
113+
go 1.23.0

0 commit comments

Comments
 (0)