Skip to content

Commit 3be12bc

Browse files
committed
update golang version 1.24.5, kube, ...
1 parent a4452f2 commit 3be12bc

File tree

24 files changed

+2697
-1547
lines changed

24 files changed

+2697
-1547
lines changed

.mk/proto.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define PROTOC_GEN
2-
go install github.com/golang/protobuf/protoc-gen-go
2+
go install google.golang.org/protobuf/cmd/protoc-gen-go
33
protoc -I. -Iflow/layers --go_out $$GOPATH/src $1
44
endef
55

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04 as builder
1+
FROM ubuntu:24.04 AS builder
22
ARG DEBIAN_FRONTEND=noninteractive
33
RUN apt-get -y update \
44
&& apt-get -y install build-essential git-core golang npm openvswitch-common libpcap0.8 libpcap0.8-dev libxml2-dev protobuf-compiler libprotobuf-dev libvirt-dev curl \
@@ -8,7 +8,7 @@ COPY . .
88
ARG GOPATH=/go
99
RUN make build
1010

11-
FROM ubuntu:22.04 as skydive
11+
FROM ubuntu:24.04 AS skydive
1212
ARG DEBIAN_FRONTEND=noninteractive
1313
RUN apt-get -y update \
1414
&& apt-get -y install golang npm openvswitch-common libpcap0.8 libvirt0 \

flow/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package flow
1919

2020
import (
21-
"github.com/golang/protobuf/proto"
21+
"google.golang.org/protobuf/proto"
2222

2323
"github.com/skydive-project/skydive/config"
2424
"github.com/skydive-project/skydive/graffiti/filters"

flow/flow.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flow/layers/dns.pb.go

Lines changed: 174 additions & 314 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flow/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package flow
1919

2020
import (
21-
"github.com/golang/protobuf/proto"
21+
"google.golang.org/protobuf/proto"
2222

2323
"github.com/skydive-project/skydive/graffiti/logging"
2424
ws "github.com/skydive-project/skydive/graffiti/websocket"

go.mod

Lines changed: 357 additions & 236 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 1832 additions & 608 deletions
Large diffs are not rendered by default.

graffiti/etcd/server/server.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ func NewEmbeddedServer(opts EmbeddedServerOpts) (*EmbeddedServer, error) {
7272
cfg := embed.NewConfig()
7373
cfg.Name = opts.Name
7474
cfg.Dir = opts.DataDir
75-
cfg.EnableV2 = true
7675
cfg.ClusterState = embed.ClusterStateFlagNew
7776
cfg.MaxWalFiles = opts.MaxWalFiles
7877
cfg.MaxSnapFiles = opts.MaxSnapFiles

graffiti/go.mod

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
module github.com/skydive-project/skydive/graffiti
22

3-
go 1.21
3+
go 1.23.0
4+
5+
toolchain go1.24.5
46

57
require (
68
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5
79
github.com/abbot/go-http-auth v0.4.0
810
github.com/avast/retry-go v3.0.0+incompatible
911
github.com/casbin/casbin v1.9.1
10-
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
12+
github.com/cnf/structhash v0.0.0-20250313080605-df4c6cc74a9a
1113
github.com/davecgh/go-spew v1.1.1
12-
github.com/evanphx/json-patch v5.9.0+incompatible
14+
github.com/evanphx/json-patch v5.9.11+incompatible
1315
github.com/fatih/structs v1.1.0
14-
github.com/go-test/deep v1.0.7
16+
github.com/go-test/deep v1.1.1
1517
github.com/gogo/protobuf v1.3.2
16-
github.com/gophercloud/gophercloud v1.11.0
18+
github.com/gophercloud/gophercloud v1.14.1
1719
github.com/gorilla/context v1.1.2
1820
github.com/gorilla/handlers v1.5.2
1921
github.com/gorilla/mux v1.8.1
20-
github.com/gorilla/websocket v1.5.1
22+
github.com/gorilla/websocket v1.5.3
2123
github.com/hashicorp/go-multierror v1.1.1
22-
github.com/hashicorp/go-version v1.6.0
24+
github.com/hashicorp/go-version v1.7.0
2325
github.com/mitchellh/go-homedir v1.1.0
2426
github.com/mitchellh/hashstructure v1.1.0
2527
github.com/mitchellh/mapstructure v1.5.0
@@ -29,91 +31,95 @@ require (
2931
github.com/pierrec/xxHash v0.1.5
3032
github.com/pkg/errors v0.9.1
3133
github.com/pmylund/go-cache v2.1.0+incompatible
32-
github.com/robertkrimen/otto v0.3.0
34+
github.com/robertkrimen/otto v0.5.1
3335
github.com/safchain/insanelock v0.0.0-20200217234559-cfbf166e05b3
3436
github.com/satori/go.uuid v1.2.0
35-
github.com/skydive-project/go-debouncer v1.0.0
36-
github.com/spf13/cast v1.6.0
37-
github.com/spf13/cobra v1.8.0
38-
github.com/stretchr/testify v1.8.4
37+
github.com/skydive-project/go-debouncer v1.0.1
38+
github.com/spf13/cast v1.9.2
39+
github.com/spf13/cobra v1.9.1
40+
github.com/stretchr/testify v1.10.0
3941
github.com/tchap/zapext v1.0.0
4042
github.com/xeipuuv/gojsonschema v1.2.0
41-
go.etcd.io/etcd/client/pkg/v3 v3.5.13
42-
go.etcd.io/etcd/client/v2 v2.305.13
43-
go.etcd.io/etcd/pkg/v3 v3.5.13
44-
go.etcd.io/etcd/server/v3 v3.5.13
43+
go.etcd.io/etcd/client/pkg/v3 v3.6.2
44+
go.etcd.io/etcd/client/v2 v2.305.21
45+
go.etcd.io/etcd/pkg/v3 v3.6.2
46+
go.etcd.io/etcd/server/v3 v3.6.2
4547
go.uber.org/zap v1.27.0
46-
golang.org/x/net v0.22.0
47-
golang.org/x/tools v0.19.0
48-
google.golang.org/protobuf v1.33.0
48+
golang.org/x/net v0.42.0
49+
golang.org/x/tools v0.35.0
50+
google.golang.org/protobuf v1.36.6
4951
gopkg.in/yaml.v2 v2.4.0
5052
)
5153

5254
require (
5355
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
5456
github.com/beorn7/perks v1.0.1 // indirect
55-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
56-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
57+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
58+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5759
github.com/coreos/go-semver v0.3.1 // indirect
5860
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5961
github.com/dustin/go-humanize v1.0.1 // indirect
6062
github.com/felixge/httpsnoop v1.0.4 // indirect
61-
github.com/go-logr/logr v1.4.1 // indirect
63+
github.com/go-logr/logr v1.4.3 // indirect
6264
github.com/go-logr/stdr v1.2.2 // indirect
63-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
65+
github.com/golang-jwt/jwt/v5 v5.2.3 // indirect
6466
github.com/golang/protobuf v1.5.4 // indirect
65-
github.com/google/btree v1.1.2 // indirect
66-
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
67-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
68-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
69-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
67+
github.com/google/btree v1.1.3 // indirect
68+
github.com/google/go-cmp v0.7.0 // indirect
69+
github.com/google/uuid v1.6.0 // indirect
70+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
71+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
7073
github.com/hashicorp/errwrap v1.1.0 // indirect
7174
github.com/inconshreveable/mousetrap v1.1.0 // indirect
72-
github.com/jonboulle/clockwork v0.4.0 // indirect
75+
github.com/jonboulle/clockwork v0.5.0 // indirect
7376
github.com/josharian/intern v1.0.0 // indirect
7477
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/mailru/easyjson v0.7.7 // indirect
76-
github.com/mattn/go-runewidth v0.0.15 // indirect
78+
github.com/mailru/easyjson v0.9.0 // indirect
79+
github.com/mattn/go-runewidth v0.0.16 // indirect
7780
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7881
github.com/modern-go/reflect2 v1.0.2 // indirect
82+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7983
github.com/pmezard/go-difflib v1.0.0 // indirect
80-
github.com/prometheus/client_golang v1.19.0 // indirect
81-
github.com/prometheus/client_model v0.6.0 // indirect
82-
github.com/prometheus/common v0.51.1 // indirect
83-
github.com/prometheus/procfs v0.13.0 // indirect
84+
github.com/prometheus/client_golang v1.22.0 // indirect
85+
github.com/prometheus/client_model v0.6.2 // indirect
86+
github.com/prometheus/common v0.65.0 // indirect
87+
github.com/prometheus/procfs v0.17.0 // indirect
8488
github.com/rivo/uniseg v0.4.7 // indirect
8589
github.com/sirupsen/logrus v1.9.3 // indirect
8690
github.com/soheilhy/cmux v0.1.5 // indirect
87-
github.com/spf13/pflag v1.0.5 // indirect
91+
github.com/spf13/pflag v1.0.7 // indirect
8892
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
8993
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
9094
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
9195
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
92-
go.etcd.io/bbolt v1.3.9 // indirect
93-
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
94-
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
95-
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
96-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
97-
go.opentelemetry.io/otel v1.24.0 // indirect
98-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
99-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
100-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
101-
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
102-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
103-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
96+
go.etcd.io/bbolt v1.4.2 // indirect
97+
go.etcd.io/etcd/api/v3 v3.6.2 // indirect
98+
go.etcd.io/etcd/client/v3 v3.6.2 // indirect
99+
go.etcd.io/raft/v3 v3.6.0 // indirect
100+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
102+
go.opentelemetry.io/otel v1.37.0 // indirect
103+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
105+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
106+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
107+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
108+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
104109
go.uber.org/multierr v1.11.0 // indirect
105-
golang.org/x/crypto v0.21.0 // indirect
106-
golang.org/x/sys v0.18.0 // indirect
107-
golang.org/x/text v0.14.0 // indirect
108-
golang.org/x/time v0.5.0 // indirect
109-
google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa // indirect
110-
google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa // indirect
111-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
112-
google.golang.org/grpc v1.62.1 // indirect
110+
go.yaml.in/yaml/v2 v2.4.2 // indirect
111+
golang.org/x/crypto v0.40.0 // indirect
112+
golang.org/x/sys v0.34.0 // indirect
113+
golang.org/x/text v0.27.0 // indirect
114+
golang.org/x/time v0.12.0 // indirect
115+
google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 // indirect
116+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
117+
google.golang.org/grpc v1.73.0 // indirect
113118
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
114119
gopkg.in/sourcemap.v1 v1.0.5 // indirect
115120
gopkg.in/yaml.v3 v3.0.1 // indirect
116-
sigs.k8s.io/yaml v1.4.0 // indirect
121+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
122+
sigs.k8s.io/yaml v1.5.0 // indirect
117123
)
118124

119125
replace (

0 commit comments

Comments
 (0)