Skip to content

Commit f535615

Browse files
committed
Merge branch 'main' of github.com:dragonflyoss/dragonfly into release-2.3
2 parents bfa7e25 + b3e8695 commit f535615

Some content is hidden

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

47 files changed

+2195
-850
lines changed

.github/workflows/auto-assign.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
add-assignee:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: kentaro-m/auto-assign-action@586b61c136c65d09c1775da39cc4a80e026834f4
14+
- uses: kentaro-m/auto-assign-action@9f6dbe84a80c6e7639d1b9698048b201052a2a94

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e
34+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d
3535
with:
3636
languages: ${{ matrix.language }}
3737

3838
- name: Autobuild
39-
uses: github/codeql-action/autobuild@d6bbdef45e766d081b84a2def353b0055f728d3e
39+
uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d
4040

4141
- name: Perform CodeQL Analysis
42-
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e
42+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d

.github/workflows/compatibility-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
include:
3232
- module: manager
3333
image: manager
34-
image-tag: v2.3.1-rc.1
34+
image-tag: v2.3.1-rc.2
3535
chart-name: manager
3636
skip: "Rate Limit | preheat files in cache"
3737
- module: scheduler

.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ jobs:
6969
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159
7070

7171
- name: Login Docker Hub
72-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
72+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
7373
with:
7474
registry: docker.io
7575
username: ${{ secrets.DOCKER_USERNAME }}
7676
password: ${{ secrets.DOCKER_PASSWORD }}
7777

7878
- name: Login to GitHub Container Registry
79-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
79+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
8080
with:
8181
registry: ghcr.io
8282
username: ${{ github.repository_owner }}
@@ -116,7 +116,7 @@ jobs:
116116
output: 'trivy-results.sarif'
117117

118118
- name: Upload Trivy scan results to GitHub Security tab
119-
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e
119+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d
120120
with:
121121
sarif_file: 'trivy-results.sarif'
122122

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464
# Upload the results to GitHub's code scanning dashboard (optional).
6565
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e
67+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d
6868
with:
6969
sarif_file: results.sarif

MAINTAINERS.md

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
11
# Maintainers
22

3-
<!-- markdownlint-disable -->
4-
5-
| GitHub ID | Name | Email | Company |
6-
| :-----------------------------------------------: | :-------------: | :--------------------------: | :-----------------------------: |
7-
| [allencloud](https://github.com/allencloud) | Allen Sun | shlallen1990@gmail.com | Alibaba Group |
8-
| [garfield009](https://github.com/garfield009) | Zuozheng Hu | zuozheng.hzz@alibaba-inc.com | Alibaba Group |
9-
| [yyzai384](https://github.com/yyzai384) | Yuan Yang | qiguo.yy@alibaba-inc.com | Alibaba Group |
10-
| [bergwolf](https://github.com/bergwolf) | Peng Tao | bergwolf@hyper.sh | Ant Group |
11-
| [jim3ma](https://github.com/jim3ma) | Jim Ma | majinjing3@gmail.com | Ant Group |
12-
| [gaius-qi](https://github.com/gaius-qi) | Gaius Qi | gaius.qi@gmail.com | Ant Group |
13-
| [chlins](https://github.com/chlins) | Chlins Zhang | chlina.zhang@gmail.com | Ant Group |
14-
| [mfarooq-intel](https://github.com/mfarooq-intel) | Mohammed Farooq | mfarooq.ta@gmail.com | Intel |
15-
| [akashhr](https://github.com/akashhr) | Akash HR | akashhr2021@gmail.com | Intel |
16-
| [hyy0322](https://github.com/hyy0322) | Yiyang Huang | 691795636@qq.com | ByteDance |
17-
| [CormickKneey](https://github.com/CormickKneey) | Han Jiang | cormick1080@gmail.com | Kuaishou |
18-
| [yxxhero](https://github.com/yxxhero) | yxxhero | aiopsclub@163.com | Zhipu AI |
19-
| [fcgxz2003](https://github.com/fcgxz2003) | fcgxz2003 | 834756128@qq.com | Dalian University of Technology |
20-
21-
<!-- markdownlint-restore -->
3+
Please refer to the [community maintainers](https://github.com/dragonflyoss/community/blob/master/MAINTAINERS.md).

OWNERS.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,8 @@ This page lists current and emeritus maintainers. This can be used for routing P
88

99
## Maintainers
1010

11-
Please refer to our [MAINTAINERS.md](MAINTAINERS.md).
11+
Please refer to our [community maintainers](https://github.com/dragonflyoss/community/blob/master/MAINTAINERS.md).
1212

1313
## Emeritus maintainers
1414

15-
Please refer to our [emeritus_members.yaml](https://github.com/dragonflyoss/community/blob/master/ladder/emeritus_members.yaml).
16-
17-
## Community Managers
18-
19-
<!-- markdownlint-disable -->
20-
21-
| GitHub ID | Name | Email | Company |
22-
| :---------------------------------------: | :--------: | :-------------------: | :-------: |
23-
| [mingcheng](https://github.com/mingcheng) | Cheng Ming | mingcheng@outlook.com | Ant Group |
24-
25-
<!-- markdownlint-restore -->
15+
Please refer to our [community emeritus maintainers](https://github.com/dragonflyoss/community/blob/master/MAINTAINERS.md#emeritus-maintainers).

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.23.8
44

55
require (
66
cloud.google.com/go/storage v1.50.0
7-
d7y.io/api/v2 v2.1.47
7+
d7y.io/api/v2 v2.1.55
88
github.com/MysteriousPotato/go-lockable v1.0.0
99
github.com/Showmax/go-fqdn v1.0.0
1010
github.com/VividCortex/mysqlerr v1.0.0
1111
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
1212
github.com/appleboy/gin-jwt/v2 v2.10.3
13-
github.com/aws/aws-sdk-go v1.55.7
13+
github.com/aws/aws-sdk-go v1.55.8
1414
github.com/bits-and-blooms/bitset v1.22.0
1515
github.com/casbin/casbin/v2 v2.81.0
1616
github.com/casbin/gorm-adapter/v3 v3.5.0
@@ -60,7 +60,7 @@ require (
6060
github.com/mitchellh/mapstructure v1.5.0
6161
github.com/montanaflynn/stats v0.7.1
6262
github.com/onsi/ginkgo/v2 v2.23.4
63-
github.com/onsi/gomega v1.36.3
63+
github.com/onsi/gomega v1.38.0
6464
github.com/opencontainers/image-spec v1.1.0
6565
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
6666
github.com/pkg/errors v0.9.1
@@ -74,7 +74,7 @@ require (
7474
github.com/stretchr/testify v1.10.0
7575
github.com/swaggo/files v1.0.1
7676
github.com/swaggo/gin-swagger v1.6.0
77-
github.com/swaggo/swag v1.16.5
77+
github.com/swaggo/swag v1.16.6
7878
github.com/yl2chen/cidranger v1.0.2
7979
github.com/zeebo/blake3 v0.2.4
8080
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.61.0
@@ -94,8 +94,8 @@ require (
9494
golang.org/x/sync v0.16.0
9595
golang.org/x/sys v0.34.0
9696
golang.org/x/time v0.12.0
97-
google.golang.org/api v0.229.0
98-
google.golang.org/grpc v1.73.0
97+
google.golang.org/api v0.244.0
98+
google.golang.org/grpc v1.74.2
9999
google.golang.org/protobuf v1.36.6
100100
gopkg.in/natefinch/lumberjack.v2 v2.0.0
101101
gopkg.in/yaml.v3 v3.0.1
@@ -108,18 +108,18 @@ require (
108108
)
109109

110110
require (
111-
cel.dev/expr v0.23.0 // indirect
112-
cloud.google.com/go v0.116.0 // indirect
113-
cloud.google.com/go/auth v0.16.0 // indirect
111+
cel.dev/expr v0.24.0 // indirect
112+
cloud.google.com/go v0.120.0 // indirect
113+
cloud.google.com/go/auth v0.16.3 // indirect
114114
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
115-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
116-
cloud.google.com/go/iam v1.2.2 // indirect
117-
cloud.google.com/go/monitoring v1.22.1 // indirect
118-
cloud.google.com/go/pubsub v1.45.3 // indirect
115+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
116+
cloud.google.com/go/iam v1.5.2 // indirect
117+
cloud.google.com/go/monitoring v1.24.2 // indirect
118+
cloud.google.com/go/pubsub v1.49.0 // indirect
119119
filippo.io/edwards25519 v1.1.0 // indirect
120120
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
121-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
122-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
121+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
122+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
123123
github.com/KyleBanks/depth v1.2.1 // indirect
124124
github.com/Microsoft/hcsshim v0.9.12 // indirect
125125
github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae // indirect
@@ -131,7 +131,7 @@ require (
131131
github.com/casbin/govaluate v1.1.0 // indirect
132132
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
133133
github.com/cloudwego/base64x v0.1.5 // indirect
134-
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
134+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
135135
github.com/containerd/errdefs v0.1.0 // indirect
136136
github.com/containerd/log v0.1.0 // indirect
137137
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
@@ -172,7 +172,7 @@ require (
172172
github.com/google/renameio/v2 v2.0.0 // indirect
173173
github.com/google/s2a-go v0.1.9 // indirect
174174
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
175-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
175+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
176176
github.com/gorilla/handlers v1.5.2 // indirect
177177
github.com/gorilla/mux v1.8.1 // indirect
178178
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
@@ -259,22 +259,22 @@ require (
259259
go.mongodb.org/mongo-driver v1.17.0 // indirect
260260
go.opencensus.io v0.24.0 // indirect
261261
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
262-
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
263-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
262+
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
263+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
264264
go.opentelemetry.io/otel/metric v1.37.0 // indirect
265265
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
266266
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
267267
go.uber.org/automaxprocs v1.6.0 // indirect
268268
go.uber.org/multierr v1.11.0 // indirect
269269
golang.org/x/arch v0.17.0 // indirect
270270
golang.org/x/mod v0.25.0 // indirect
271-
golang.org/x/net v0.41.0 // indirect
271+
golang.org/x/net v0.42.0 // indirect
272272
golang.org/x/term v0.33.0 // indirect
273273
golang.org/x/text v0.27.0 // indirect
274274
golang.org/x/tools v0.34.0 // indirect
275-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
275+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
276276
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
277-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
277+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
278278
gopkg.in/ini.v1 v1.67.0 // indirect
279279
gopkg.in/yaml.v2 v2.4.0 // indirect
280280
gorm.io/driver/sqlserver v1.4.1 // indirect

0 commit comments

Comments
 (0)