Skip to content

Commit f503924

Browse files
taoyoungertaoyounger
authoredSep 6, 2024··
Merge pull request #223 from ty-dc/revert-222-update-go
Revert "Update golang to v1.23.0 to fix memory leak"
2 parents faf4c2d + 2d5309a commit f503924

File tree

33 files changed

+213
-410
lines changed

33 files changed

+213
-410
lines changed
 

‎.github/workflows/auto-upgrade-ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ jobs:
214214
- name: Setup Golang
215215
uses: actions/setup-go@v5
216216
with:
217-
go-version: 1.23.0
217+
go-version: 1.21.4
218218

219219
- name: Install Kind Bin
220220
uses: helm/kind-action@v1.10.0

‎.github/workflows/e2e-init.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- name: Setup Golang
9797
uses: actions/setup-go@v5
9898
with:
99-
go-version: 1.23.0
99+
go-version: 1.22.3
100100

101101
- name: Install Tools
102102
run: |

‎.github/workflows/lint-golang.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Install Go
8383
uses: actions/setup-go@v5
8484
with:
85-
go-version: 1.23.0
85+
go-version: 1.21.4
8686

8787
- name: Checkout code
8888
uses: actions/checkout@v4
@@ -138,7 +138,7 @@ jobs:
138138
- name: Install Go
139139
uses: actions/setup-go@v5
140140
with:
141-
go-version: 1.23.0
141+
go-version: 1.21.4
142142

143143
- name: Checkout code
144144
uses: actions/checkout@v4
@@ -192,7 +192,7 @@ jobs:
192192
- name: Install Go
193193
uses: actions/setup-go@v5
194194
with:
195-
go-version: 1.23.0
195+
go-version: 1.21.4
196196

197197
- name: Checkout code
198198
uses: actions/checkout@v4

‎.github/workflows/update-golang-version.yaml

-78
This file was deleted.

‎Makefile.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GO_VERSION := 1.23.0
1+
GO_VERSION := 1.21.4
22
GINKGO_VERSION := 2.1.3

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/spidernet-io/spiderpool
22

3-
go 1.23.0
3+
go 1.22.0
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.11.0
@@ -19,7 +19,7 @@ require (
1919
github.com/gogo/protobuf v1.3.2
2020
github.com/golang/mock v1.6.0
2121
github.com/google/gops v0.3.27
22-
github.com/grafana/pyroscope-go v1.1.2
22+
github.com/grafana/pyroscope-go v1.1.1
2323
github.com/jessevdk/go-flags v1.5.0
2424
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
2525
github.com/kdoctor-io/kdoctor v0.2.0
@@ -117,7 +117,7 @@ require (
117117
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
118118
github.com/google/uuid v1.6.0 // indirect
119119
github.com/gorilla/handlers v1.5.1 // indirect
120-
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
120+
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
121121
github.com/hashicorp/errwrap v1.1.0 // indirect
122122
github.com/hashicorp/hcl v1.0.0 // indirect
123123
github.com/huandu/xstrings v1.3.3 // indirect
@@ -126,7 +126,7 @@ require (
126126
github.com/josharian/intern v1.0.0 // indirect
127127
github.com/josharian/native v1.1.0 // indirect
128128
github.com/json-iterator/go v1.1.12 // indirect
129-
github.com/klauspost/compress v1.17.8 // indirect
129+
github.com/klauspost/compress v1.17.3 // indirect
130130
github.com/kr/pretty v0.3.1 // indirect
131131
github.com/kr/text v0.2.0 // indirect
132132
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH
303303
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
304304
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
305305
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
306-
github.com/grafana/pyroscope-go v1.1.2 h1:7vCfdORYQMCxIzI3NlYAs3FcBP760+gWuYWOyiVyYx8=
307-
github.com/grafana/pyroscope-go v1.1.2/go.mod h1:HSSmHo2KRn6FasBA4vK7BMiQqyQq8KSuBKvrhkXxYPU=
308-
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
309-
github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
306+
github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
307+
github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
308+
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
309+
github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
310310
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
311311
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
312312
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
@@ -350,8 +350,8 @@ github.com/kdoctor-io/kdoctor v0.2.0/go.mod h1:TxkjBwM4sdnOTHABxgL1gO68tlzHUnbiu
350350
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
351351
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
352352
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
353-
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
354-
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
353+
github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
354+
github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
355355
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
356356
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
357357
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=

‎images/spiderpool-agent/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:1f8330482d25b58d2ae26bc6252e20384bac92ad
5-
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd
5+
ARG GOLANG_IMAGE=docker.io/library/golang:1.22.0@sha256:03082deb6ae090a0caa4e4a8f666bc59715bc6fa67f5fd109f823a0c4e1efc2a
66

77
#======= build bin ==========
88
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} as builder

‎images/spiderpool-base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# docker buildx build -t testbase:latest --platform=linux/arm64,linux/amd64 --output type=docker .
55

6-
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd
6+
ARG GOLANG_IMAGE=docker.io/library/golang:1.22.0@sha256:03082deb6ae090a0caa4e4a8f666bc59715bc6fa67f5fd109f823a0c4e1efc2a
77
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb
88

99

‎images/spiderpool-controller/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:1f8330482d25b58d2ae26bc6252e20384bac92ad
5-
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd
5+
ARG GOLANG_IMAGE=docker.io/library/golang:1.22.0@sha256:03082deb6ae090a0caa4e4a8f666bc59715bc6fa67f5fd109f823a0c4e1efc2a
66

77
#======= build bin ==========
88
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} as builder

‎images/spiderpool-plugins/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2023 Authors of spidernet-io
22
# SPDX-License-Identifier: Apache-2.0
33

4-
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.0@sha256:613a108a4a4b1dfb6923305db791a19d088f77632317cfc3446825c54fb862cd
4+
ARG GOLANG_IMAGE=docker.io/library/golang:1.22.0@sha256:03082deb6ae090a0caa4e4a8f666bc59715bc6fa67f5fd109f823a0c4e1efc2a
55

66
#======= build plugins ==========
77
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} as builder

‎vendor/github.com/grafana/pyroscope-go/CODEOWNERS

-1
This file was deleted.

‎vendor/github.com/grafana/pyroscope-go/Makefile

+9-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/README.md

+2-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/go.mod_go16_test.txt

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/go.work

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/go.work.sum

+7-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/README.md

+2-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/block.go

+21-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/heap.go

+15-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/builder.go

-18
This file was deleted.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/delta_heap.go

+37-66
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/delta_mutex.go

+24-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/map.go

+26-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/proto.go

+16-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub.go

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go20.go

+1-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go23.go ‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go21.go

+2-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go22.go

-27
This file was deleted.

‎vendor/github.com/grafana/pyroscope-go/upstream/remote/remote.go

+1-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/klauspost/compress/flate/deflate.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/klauspost/compress/gzip/gunzip.go

-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ github.com/google/uuid
285285
# github.com/gorilla/handlers v1.5.1
286286
## explicit; go 1.14
287287
github.com/gorilla/handlers
288-
# github.com/grafana/pyroscope-go v1.1.2
288+
# github.com/grafana/pyroscope-go v1.1.1
289289
## explicit; go 1.17
290290
github.com/grafana/pyroscope-go
291291
github.com/grafana/pyroscope-go/internal/flameql
292292
github.com/grafana/pyroscope-go/internal/pprof
293293
github.com/grafana/pyroscope-go/internal/sortedmap
294294
github.com/grafana/pyroscope-go/upstream
295295
github.com/grafana/pyroscope-go/upstream/remote
296-
# github.com/grafana/pyroscope-go/godeltaprof v0.1.8
297-
## explicit; go 1.18
296+
# github.com/grafana/pyroscope-go/godeltaprof v0.1.6
297+
## explicit; go 1.16
298298
github.com/grafana/pyroscope-go/godeltaprof
299299
github.com/grafana/pyroscope-go/godeltaprof/internal/pprof
300300
# github.com/hashicorp/errwrap v1.1.0
@@ -345,8 +345,8 @@ github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils
345345
## explicit; go 1.20
346346
github.com/kdoctor-io/kdoctor/pkg/k8s/apis/kdoctor.io/v1beta1
347347
github.com/kdoctor-io/kdoctor/pkg/utils/string
348-
# github.com/klauspost/compress v1.17.8
349-
## explicit; go 1.20
348+
# github.com/klauspost/compress v1.17.3
349+
## explicit; go 1.19
350350
github.com/klauspost/compress/flate
351351
github.com/klauspost/compress/gzip
352352
# github.com/kr/pretty v0.3.1

0 commit comments

Comments
 (0)
Please sign in to comment.