Skip to content

Commit a924523

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

File tree

25 files changed

+2698
-1548
lines changed

25 files changed

+2698
-1548
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: '1.21'
19+
go-version: '1.24'
2020
cache-dependency-path: go.sum
2121

2222
- name: Install pcap

.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

0 commit comments

Comments
 (0)