Skip to content

Commit 04ee8bd

Browse files
iutxiutx
authored
build: upgrade dependence to golang1.24 (#14)
* build: upgrade dependence to golang1.24 Signed-off-by: Ash <root@viper.run> * ci: upgrade to ebpf-devel:v0.4 Signed-off-by: Ash <root@viper.run> * ci: install golang 1.24 Signed-off-by: Ash <root@viper.run> * fix: remove LogSize, the correct log buffer size is determined automatically Signed-off-by: Ash <root@viper.run> --------- Signed-off-by: Ash <root@viper.run>
1 parent ab71d41 commit 04ee8bd

File tree

6 files changed

+91
-114
lines changed

6 files changed

+91
-114
lines changed

‎.github/workflows/ci-it.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
CODE-CHECK:
2323
runs-on: ubuntu-latest
2424
container:
25-
image: registry.erda.cloud/erda/ebpf-devel:v0.3
25+
image: registry.erda.cloud/erda/ebpf-devel:v0.4
2626
steps:
2727
- uses: actions/checkout@v2
2828
- name: Run go mod tidy

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GOPROXY ?= https://goproxy.cn,direct
77
PROJ_PATH := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
88
REGISTRY ?= registry.erda.cloud/erda
99
KERNEL_VERSION ?= 5.15.0-87-generic
10-
EBPF_DEVEL_VERSION ?= v0.3
10+
EBPF_DEVEL_VERSION ?= v0.4
1111
IMAGE_TAG = $(shell date '+%Y%m%d%H%M%S')
1212
DOCKER_IMAGE="$(REGISTRY)/ebpf-agent:1.0-$(IMAGE_TAG)"
1313

‎go.mod‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/erda-project/erda-agent
22

3-
go 1.22
3+
go 1.24
44

55
require (
6-
github.com/cilium/ebpf v0.11.0
7-
github.com/erda-project/erda-infra v1.0.8
6+
github.com/cilium/ebpf v0.17.3
7+
github.com/erda-project/erda-infra v1.0.9
88
github.com/euank/go-kmsg-parser v2.0.0+incompatible
9-
github.com/influxdata/influxdb-client-go/v2 v2.12.3
9+
github.com/influxdata/influxdb-client-go/v2 v2.14.0
1010
github.com/patrickmn/go-cache v2.1.0+incompatible
1111
github.com/pkg/errors v0.9.1
12-
github.com/prometheus/procfs v0.12.0
13-
github.com/vishvananda/netlink v1.1.0
14-
golang.org/x/sys v0.18.0
12+
github.com/prometheus/procfs v0.15.1
13+
github.com/vishvananda/netlink v1.3.0
14+
golang.org/x/sys v0.31.0
1515
k8s.io/api v0.28.1
1616
k8s.io/apimachinery v0.28.1
1717
k8s.io/client-go v0.28.1
@@ -23,8 +23,8 @@ require (
2323

2424
require (
2525
github.com/Microsoft/go-winio v0.6.1 // indirect
26+
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
2627
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/deepmap/oapi-codegen v1.8.2 // indirect
2828
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
2929
github.com/go-logr/logr v1.2.4 // indirect
3030
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -33,40 +33,41 @@ require (
3333
github.com/gogo/protobuf v1.3.2 // indirect
3434
github.com/golang/protobuf v1.5.3 // indirect
3535
github.com/google/gnostic v0.5.7-v3refs // indirect
36-
github.com/google/go-cmp v0.5.9 // indirect
36+
github.com/google/go-cmp v0.6.0 // indirect
3737
github.com/google/gofuzz v1.2.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
3839
github.com/hashicorp/hcl v1.0.0 // indirect
3940
github.com/imdario/mergo v0.3.13 // indirect
40-
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
41+
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
4142
github.com/josharian/intern v1.0.0 // indirect
4243
github.com/json-iterator/go v1.1.12 // indirect
43-
github.com/magiconair/properties v1.8.5 // indirect
44+
github.com/magiconair/properties v1.8.6 // indirect
4445
github.com/mailru/easyjson v0.7.7 // indirect
4546
github.com/mitchellh/mapstructure v1.4.1 // indirect
4647
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4748
github.com/modern-go/reflect2 v1.0.2 // indirect
4849
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50+
github.com/oapi-codegen/runtime v1.1.1 // indirect
4951
github.com/pelletier/go-toml v1.9.4 // indirect
5052
github.com/recallsong/go-utils v1.1.2-0.20210826100715-fce05eefa294 // indirect
5153
github.com/recallsong/unmarshal v1.0.0 // indirect
5254
github.com/sirupsen/logrus v1.9.0 // indirect
5355
github.com/spf13/pflag v1.0.5 // indirect
54-
github.com/stretchr/testify v1.8.4 // indirect
55-
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
56-
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
57-
golang.org/x/mod v0.10.0 // indirect
58-
golang.org/x/net v0.23.0 // indirect
56+
github.com/vishvananda/netns v0.0.5 // indirect
57+
golang.org/x/mod v0.17.0 // indirect
58+
golang.org/x/net v0.37.0 // indirect
5959
golang.org/x/oauth2 v0.10.0 // indirect
60-
golang.org/x/term v0.18.0 // indirect
61-
golang.org/x/text v0.14.0 // indirect
62-
golang.org/x/time v0.3.0 // indirect
63-
golang.org/x/tools v0.8.0 // indirect
60+
golang.org/x/sync v0.12.0 // indirect
61+
golang.org/x/term v0.30.0 // indirect
62+
golang.org/x/text v0.23.0 // indirect
63+
golang.org/x/time v0.5.0 // indirect
64+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
6465
google.golang.org/appengine v1.6.7 // indirect
6566
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
6667
google.golang.org/grpc v1.58.3 // indirect
6768
google.golang.org/protobuf v1.33.0 // indirect
6869
gopkg.in/inf.v0 v0.9.1 // indirect
69-
gopkg.in/ini.v1 v1.63.2 // indirect
70+
gopkg.in/ini.v1 v1.67.0 // indirect
7071
gopkg.in/yaml.v2 v2.4.0 // indirect
7172
gopkg.in/yaml.v3 v3.0.1 // indirect
7273
k8s.io/apiserver v0.26.2 // indirect

0 commit comments

Comments
 (0)