Skip to content

Commit c236f25

Browse files
authored
[fix] go mod version v5 (#776)
1 parent fc623f2 commit c236f25

File tree

50 files changed

+1048
-376
lines changed

Some content is hidden

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

50 files changed

+1048
-376
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
**To help us figure out who should review this PR, please put an X in all the areas that this PR affects.**
44

5-
- [ ] Docs
65
- [ ] Installation
76
- [ ] Test and Release
87
- [ ] User Experience
9-
- [ ] Dashboard
108
- [ ] Register Plane Revisions
11-
9+
- [ ] Control Plane Revisions
1210
**Please check any characteristics that apply to this pull request.**
1311

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Provides support for building and deploying Dubbo applications in various enviro
1111
## Repositories
1212
The main code repositories of Dubbo on Kubernetes include:
1313

14+
- Dubbod — The Dubbo control plane. It is built on Istio to implement a proxyless service mesh and includes the following components:
15+
- [navigator](navigator/) (under development): Responsible for configuring proxies at runtime.
1416
- [dubboctl](dubboctl/). This directory contains code for the command line utility.
1517
- [operator](operator/). Dubbo operator provides user friendly options to operate the Dubbo proxyless mesh
1618
- [helm-charts](manifests/charts). This directory contains the [Helm chart](https://github.com/apache/dubbo-helm-charts) sources, which are versioned, built, and pushed to the following Helm repositories with each Dubbo release.

dubboctl/pkg/hub/builder/pack/build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
const DefaultName = builder.Pack
3838

3939
var (
40-
DefaultGoBuilder = "heroku/builder:24"
41-
DefaultJavaBuilder = "heroku/builder:24"
40+
DefaultGoBuilder = "sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/builder:24"
41+
DefaultJavaBuilder = "sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/builder:24"
4242
)
4343

4444
var (

go.mod

Lines changed: 80 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
module github.com/apache/dubbo-kubernetes
1717

18-
go 1.24.0
18+
go 1.23.0
1919

2020
require (
2121
github.com/AlecAivazis/survey/v2 v2.3.7
2222
github.com/Microsoft/go-winio v0.6.2
2323
github.com/buildpacks/pack v0.30.0
24-
github.com/cheggaaa/pb/v3 v3.1.7
24+
github.com/cheggaaa/pb/v3 v3.1.6
2525
github.com/chzyer/readline v1.5.1
2626
github.com/containers/image/v5 v5.34.0
2727
github.com/containers/storage v1.57.1
@@ -30,46 +30,46 @@ require (
3030
github.com/docker/docker-credential-helpers v0.8.2
3131
github.com/docker/go-connections v0.5.0
3232
github.com/fatih/color v1.18.0
33-
github.com/fsnotify/fsnotify v1.9.0
33+
github.com/fsnotify/fsnotify v1.8.0
3434
github.com/go-git/go-billy/v5 v5.6.2
3535
github.com/go-git/go-git/v5 v5.13.1
3636
github.com/gogo/protobuf v1.3.2
3737
github.com/golang/protobuf v1.5.4
3838
github.com/google/go-containerregistry v0.20.3
3939
github.com/hashicorp/go-multierror v1.1.1
4040
github.com/heroku/color v0.0.6
41-
github.com/moby/term v0.5.2
41+
github.com/moby/term v0.5.0
4242
github.com/ory/viper v1.7.5
4343
github.com/pkg/errors v0.9.1
4444
github.com/sashabaranov/go-openai v1.40.5
45-
github.com/spf13/cobra v1.9.1
46-
github.com/spf13/pflag v1.0.6
45+
github.com/spf13/cobra v1.8.1
46+
github.com/spf13/pflag v1.0.5
4747
github.com/tmc/langchaingo v0.1.13
4848
go.uber.org/atomic v1.11.0
49-
golang.org/x/crypto v0.40.0
50-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
51-
golang.org/x/net v0.42.0
52-
golang.org/x/term v0.33.0
53-
google.golang.org/grpc v1.74.0
49+
golang.org/x/crypto v0.37.0
50+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
51+
golang.org/x/net v0.38.0
52+
golang.org/x/term v0.31.0
53+
google.golang.org/grpc v1.69.4
5454
google.golang.org/protobuf v1.36.6
5555
gopkg.in/yaml.v3 v3.0.1
56-
helm.sh/helm/v3 v3.18.4
57-
istio.io/api v1.26.3
58-
istio.io/client-go v1.26.0-alpha.0.0.20250807122224-d30e00749aaa
59-
istio.io/istio v0.0.0-20250808002224-522bbac962b8
60-
k8s.io/api v0.33.2
61-
k8s.io/apiextensions-apiserver v0.33.2
62-
k8s.io/apimachinery v0.33.2
63-
k8s.io/client-go v0.33.2
64-
k8s.io/kubectl v0.33.2
65-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
66-
sigs.k8s.io/yaml v1.5.0
56+
helm.sh/helm/v3 v3.17.0
57+
istio.io/api v1.25.0-alpha.0.0.20250212060243-76cd29bc906f
58+
istio.io/client-go v1.25.0-alpha.0.0.20250212060743-20055c33db8f
59+
k8s.io/api v0.32.1
60+
k8s.io/apiextensions-apiserver v0.32.1
61+
k8s.io/apimachinery v0.32.1
62+
k8s.io/client-go v0.32.1
63+
k8s.io/kubectl v0.32.1
64+
k8s.io/utils v0.0.0-20241210054802-24370beab758
65+
sigs.k8s.io/yaml v1.4.0
6766
)
6867

6968
require (
70-
dario.cat/mergo v1.0.2 // indirect
69+
dario.cat/mergo v1.0.1 // indirect
70+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
7171
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
72-
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
72+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7373
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
7474
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
7575
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
7979
github.com/Azure/go-autorest/logger v0.2.1 // indirect
8080
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
81-
github.com/BurntSushi/toml v1.5.0 // indirect
81+
github.com/BurntSushi/toml v1.4.0 // indirect
8282
github.com/Masterminds/goutils v1.1.1 // indirect
8383
github.com/Masterminds/semver v1.5.0 // indirect
8484
github.com/Masterminds/semver/v3 v3.3.1 // indirect
@@ -88,59 +88,57 @@ require (
8888
github.com/VividCortex/ewma v1.2.0 // indirect
8989
github.com/agext/levenshtein v1.2.3 // indirect
9090
github.com/apex/log v1.9.0 // indirect
91-
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
92-
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
93-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
94-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
91+
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
92+
github.com/aws/aws-sdk-go-v2/config v1.27.12 // indirect
93+
github.com/aws/aws-sdk-go-v2/credentials v1.17.12 // indirect
94+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
9797
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
9898
github.com/aws/aws-sdk-go-v2/service/ecr v1.18.11 // indirect
9999
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.16.2 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
102-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
103-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
104-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
105-
github.com/aws/smithy-go v1.20.3 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
102+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.6 // indirect
103+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.5 // indirect
104+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.7 // indirect
105+
github.com/aws/smithy-go v1.20.2 // indirect
106106
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20230522190001-adf1bafd791a // indirect
107107
github.com/blang/semver/v4 v4.0.0 // indirect
108108
github.com/buildpacks/imgutil v0.0.0-20230626185301-726f02e4225c // indirect
109109
github.com/buildpacks/lifecycle v0.17.0 // indirect
110110
github.com/cespare/xxhash v1.1.0 // indirect
111111
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
112112
github.com/cloudflare/circl v1.3.7 // indirect
113-
github.com/containerd/log v0.1.0 // indirect
113+
github.com/containerd/containerd v1.7.24 // indirect
114114
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
115-
github.com/containerd/typeurl/v2 v2.2.3 // indirect
116-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
115+
github.com/containerd/typeurl v1.0.2 // indirect
116+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
117117
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
118118
github.com/dgraph-io/ristretto v0.0.1 // indirect
119119
github.com/dimchansky/utfbom v1.1.1 // indirect
120-
github.com/distribution/reference v0.6.0 // indirect
121120
github.com/dlclark/regexp2 v1.10.0 // indirect
122121
github.com/docker/distribution v2.8.3+incompatible // indirect
123122
github.com/docker/go-units v0.5.0 // indirect
124123
github.com/dustin/go-humanize v1.0.1 // indirect
125-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
124+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
126125
github.com/emirpasic/gods v1.18.1 // indirect
127-
github.com/felixge/httpsnoop v1.0.4 // indirect
128-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
126+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
129127
github.com/gdamore/encoding v1.0.0 // indirect
130128
github.com/gdamore/tcell/v2 v2.6.0 // indirect
131129
github.com/go-errors/errors v1.5.1 // indirect
132130
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
133-
github.com/go-logr/logr v1.4.3 // indirect
134-
github.com/go-logr/stdr v1.2.2 // indirect
135-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
131+
github.com/go-logr/logr v1.4.2 // indirect
132+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
136133
github.com/go-openapi/jsonreference v0.21.0 // indirect
137-
github.com/go-openapi/swag v0.23.1 // indirect
134+
github.com/go-openapi/swag v0.23.0 // indirect
138135
github.com/gobwas/glob v0.2.3 // indirect
139-
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
136+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
140137
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
141138
github.com/google/btree v1.1.3 // indirect
142139
github.com/google/gnostic-models v0.6.9 // indirect
143-
github.com/google/go-cmp v0.7.0 // indirect
140+
github.com/google/go-cmp v0.6.0 // indirect
141+
github.com/google/gofuzz v1.2.0 // indirect
144142
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
145143
github.com/google/uuid v1.6.0 // indirect
146144
github.com/goph/emperror v0.17.2 // indirect
@@ -158,7 +156,7 @@ require (
158156
github.com/klauspost/compress v1.18.0 // indirect
159157
github.com/klauspost/pgzip v1.2.6 // indirect
160158
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
161-
github.com/magiconair/properties v1.8.7 // indirect
159+
github.com/magiconair/properties v1.8.9 // indirect
162160
github.com/mailru/easyjson v0.9.0 // indirect
163161
github.com/mattn/go-colorable v0.1.14 // indirect
164162
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -169,30 +167,31 @@ require (
169167
github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e // indirect
170168
github.com/mitchellh/mapstructure v1.5.0 // indirect
171169
github.com/mitchellh/reflectwalk v1.0.2 // indirect
172-
github.com/moby/buildkit v0.21.1 // indirect
173-
github.com/moby/docker-image-spec v1.3.1 // indirect
170+
github.com/moby/buildkit v0.19.0 // indirect
174171
github.com/moby/patternmatcher v0.6.0 // indirect
175172
github.com/moby/sys/capability v0.4.0 // indirect
176173
github.com/moby/sys/mountinfo v0.7.2 // indirect
177-
github.com/moby/sys/sequential v0.6.0 // indirect
178-
github.com/moby/sys/user v0.4.0 // indirect
174+
github.com/moby/sys/sequential v0.5.0 // indirect
175+
github.com/moby/sys/user v0.3.0 // indirect
179176
github.com/moby/sys/userns v0.1.0 // indirect
180177
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
181178
github.com/modern-go/reflect2 v1.0.2 // indirect
182179
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
183180
github.com/morikuni/aec v1.0.0 // indirect
184181
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
185182
github.com/nikolalohinski/gonja v1.5.3 // indirect
183+
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
184+
github.com/onsi/gomega v1.36.2 // indirect
186185
github.com/opencontainers/go-digest v1.0.0 // indirect
187-
github.com/opencontainers/image-spec v1.1.1 // indirect
186+
github.com/opencontainers/image-spec v1.1.0 // indirect
187+
github.com/opencontainers/runc v1.1.7 // indirect
188188
github.com/opencontainers/runtime-spec v1.2.0 // indirect
189189
github.com/opencontainers/selinux v1.11.1 // indirect
190190
github.com/pelletier/go-toml v1.9.5 // indirect
191-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
191+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
192192
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
193193
github.com/pjbgf/sha1cd v0.3.0 // indirect
194194
github.com/pkoukk/tiktoken-go v0.1.6 // indirect
195-
github.com/planetscale/vtprotobuf v0.6.1-0.20240409071808-615f978279ca // indirect
196195
github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8 // indirect
197196
github.com/rivo/uniseg v0.4.7 // indirect
198197
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
@@ -201,54 +200,51 @@ require (
201200
github.com/sirupsen/logrus v1.9.3 // indirect
202201
github.com/skeema/knownhosts v1.3.0 // indirect
203202
github.com/spaolacci/murmur3 v1.1.0 // indirect
204-
github.com/spf13/afero v1.14.0 // indirect
205-
github.com/spf13/cast v1.8.0 // indirect
203+
github.com/spf13/afero v1.11.0 // indirect
204+
github.com/spf13/cast v1.7.0 // indirect
206205
github.com/spf13/jwalterweatherman v1.1.0 // indirect
207206
github.com/subosito/gotenv v1.6.0 // indirect
208-
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
209207
github.com/ulikunitz/xz v0.5.12 // indirect
210-
github.com/vbatts/tar-split v0.12.1 // indirect
208+
github.com/vbatts/tar-split v0.11.7 // indirect
211209
github.com/x448/float16 v0.8.4 // indirect
212210
github.com/xanzy/ssh-agent v0.3.3 // indirect
213211
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
214212
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
215213
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
216214
github.com/xlab/treeprint v1.2.0 // indirect
217215
github.com/yargevad/filepathx v1.0.0 // indirect
218-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
219-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
220-
go.opentelemetry.io/otel v1.36.0 // indirect
221-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
222-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
216+
go.opentelemetry.io/otel v1.34.0 // indirect
217+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
223218
go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 // indirect
224-
go.yaml.in/yaml/v2 v2.4.2 // indirect
225-
go.yaml.in/yaml/v3 v3.0.3 // indirect
226-
golang.org/x/mod v0.25.0 // indirect
227-
golang.org/x/oauth2 v0.30.0 // indirect
228-
golang.org/x/sync v0.16.0 // indirect
229-
golang.org/x/sys v0.34.0 // indirect
230-
golang.org/x/text v0.27.0 // indirect
231-
golang.org/x/time v0.11.0 // indirect
232-
google.golang.org/api v0.224.0 // indirect
233-
google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 // indirect
234-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
219+
golang.org/x/mod v0.22.0 // indirect
220+
golang.org/x/oauth2 v0.25.0 // indirect
221+
golang.org/x/sync v0.13.0 // indirect
222+
golang.org/x/sys v0.32.0 // indirect
223+
golang.org/x/text v0.24.0 // indirect
224+
golang.org/x/time v0.9.0 // indirect
225+
google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4 // indirect
226+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4 // indirect
235227
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
236228
gopkg.in/inf.v0 v0.9.1 // indirect
237229
gopkg.in/ini.v1 v1.67.0 // indirect
238230
gopkg.in/warnings.v0 v0.1.2 // indirect
239231
gopkg.in/yaml.v2 v2.4.0 // indirect
240-
k8s.io/cli-runtime v0.33.2 // indirect
232+
k8s.io/cli-runtime v0.32.1 // indirect
241233
k8s.io/klog/v2 v2.130.1 // indirect
242-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
234+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
243235
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
244-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
245-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
246-
sigs.k8s.io/randfill v1.0.0 // indirect
247-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
236+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
237+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
238+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
248239
)
249240

250241
replace (
242+
github.com/containers/image/v5 => github.com/containers/image/v5 v5.34.0
251243
github.com/docker/cli => github.com/docker/cli v23.0.1+incompatible
252244
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
253245
github.com/docker/docker => github.com/docker/docker v23.0.1+incompatible
246+
github.com/google/go-containerregistry => github.com/google/go-containerregistry v0.20.2
247+
github.com/moby/buildkit => github.com/moby/buildkit v0.10.6
248+
github.com/moby/dockerfile => github.com/moby/dockerfile v1.4.1
249+
254250
)

0 commit comments

Comments
 (0)