Skip to content

Commit 3c00a64

Browse files
authored
Merge branch 'master' into inplace
2 parents d5546cd + a42f1d8 commit 3c00a64

File tree

459 files changed

+29967
-22122
lines changed

Some content is hidden

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

459 files changed

+29967
-22122
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
command: |
2020
test -z "$(go fmt ./... 2>/dev/null | tee /dev/stderr)" || (echo "please format Go code with 'gofmt'")
2121
go vet ./...
22-
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=helm-v3.11.3 . -f docker/Dockerfile.dataset -t dataset-controller:${CIRCLE_BUILD_NUM}
23-
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=helm-v3.11.3 . -f docker/Dockerfile.alluxioruntime -t alluxioruntime-controller:${CIRCLE_BUILD_NUM}
24-
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=helm-v3.11.3 . -f docker/Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM}
22+
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 . -f docker/Dockerfile.dataset -t dataset-controller:${CIRCLE_BUILD_NUM}
23+
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 . -f docker/Dockerfile.alluxioruntime -t alluxioruntime-controller:${CIRCLE_BUILD_NUM}
24+
- run: docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 . -f docker/Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM}
2525

2626
# maybe later we need to upload output to helm repository

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v3.28.15
47+
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v3.28.15
67+
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5

.github/workflows/kind-e2e.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
kubernetes-version: ["v1.29.2", "v1.28.7", "v1.26.15", "v1.24.17", "v1.22.17"]
27+
kubernetes-version: ["v1.33.2", "v1.30.13", "v1.28.15", "v1.24.17", "v1.22.17"]
2828
env:
2929
GOPATH: ${{ github.workspace }}
3030
GO111MODULE: auto
@@ -35,21 +35,22 @@ jobs:
3535

3636
steps:
3737
- name: Set up Go
38-
uses: actions/setup-go@v5
38+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3939
with:
4040
go-version: ${{ env.GO_VERSION }}
4141

4242
- name: Set up Helm
43-
uses: azure/[email protected].0
43+
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
4444

4545
- name: Checkout code
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4747
with:
4848
path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
4949

5050
- name: Create k8s Kind Cluster
51-
uses: helm/[email protected]
51+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
5252
with:
53+
version: v0.29.0 # default version in v1.12.0 is v0.24.0, bump to v0.29.0 to solve https://github.com/kubernetes-sigs/kind/issues/3853
5354
node_image: kindest/node:${{ matrix.kubernetes-version }}
5455
cluster_name: ${{ env.KIND_CLUSTER }}
5556
kubectl_version: ${{ matrix.kubernetes-version }}
@@ -73,7 +74,7 @@ jobs:
7374
7475
- name: Dump environment
7576
if: ${{ !cancelled() }}
76-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7778
with:
7879
name: gha-e2e-logs-${{ github.job }}-${{ matrix.kubernetes-version }}
7980
path: "src/github.com/fluid-cloudnative/fluid/e2e-tmp/testcase-*.tgz"

.github/workflows/project-check.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
staticcheck:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: dominikh/staticcheck-action@v1
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: dominikh/staticcheck-action@024238d2898c874f26d723e7d0ff4308c35589a2 # v1
2121

2222
lint:
2323
runs-on: ubuntu-latest
@@ -29,17 +29,17 @@ jobs:
2929
working-directory: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
3030
steps:
3131
- name: Set up Go
32-
uses: actions/setup-go@v5
32+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3333
with:
3434
go-version: ${{ env.GO_VERSION }}
3535

3636
- name: Checkout code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3838
with:
3939
path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
4040

4141
- name: Lint golang code
42-
uses: golangci/golangci-lint-action@v6
42+
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
4343
with:
4444
version: latest
4545
args: --timeout 10m --verbose
@@ -84,12 +84,12 @@ jobs:
8484
runs-on: ubuntu-latest
8585
steps:
8686
- name: Set up Go
87-
uses: actions/setup-go@v5
87+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
8888
with:
8989
go-version: ${{ env.GO_VERSION }}
9090

9191
- name: Checkout code
92-
uses: actions/checkout@v4
92+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9393
with:
9494
path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
9595

@@ -105,4 +105,8 @@ jobs:
105105
run: |
106106
make build
107107
make test
108-
bash <(curl -s https://codecov.io/bash)
108+
109+
- name: Upload coverage to Codecov
110+
uses: codecov/codecov-action@v5
111+
with:
112+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/sonarcloud.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929

3030
steps:
3131
- name: "Checkout code"
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3333
with:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -43,13 +43,13 @@ jobs:
4343
exclude_paths: "vendor/**"
4444

4545
- name: "Upload artifact"
46-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4747
with:
4848
name: SARIF file
4949
path: results.sarif
5050
retention-days: 5
5151

5252
- name: "Upload to code-scanning"
53-
uses: github/codeql-action/upload-sarif@4c3e5362829f0b0bb62ff5f6c938d7f95574c306 # v2.22.11
53+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v2.22.11
5454
with:
5555
sarif_file: results.sarif

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ openapi-gen
3838
# debug related
3939
**/__debug_bin
4040
**/__pycache__
41+
42+
**/coverage.txt

ADOPTERS.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,44 @@ The following are the adopters of project Fluid. If you are using Fluid to simpl
1010
The companies/organizations are listed in alphabetical order grouped by the phase.
1111
| Organization | Contact | Phases | Description of Use |
1212
| ------------ | ------- | ----------- | ------------------ |
13-
| [4Paradigm.com](http://www.4paradigm.com/) | [@mahao](mahao@4paradigm.com) | Testing | 4Paradigm Sage EE |
14-
| [PITS Globale Datenrettungsdienste](https://www.pitsdatenrettung.de/) | [@arnoldberlin](mahao@4paradigm.com) | Testing | ML & Kubernetes |
15-
| [BossZhipin](https://www.zhipin.com/) | [@lilyzhoupeijie](zhoupeijie@kanzhun.com) | Staging | Alsenal AI Platform |
16-
| [China Telecom](https://www.chinatelecom-h.com/en/global/home.php) | [@yangyuliufeng]([email protected]) | Staging | AI Platform on k8s |
17-
| [HAOMO](http://haomo.ai/) | [@tongyan]([email protected]) | Testing | HAOMO Auto Machine Learning Platform |
18-
| [Platform of Artificial Intelligence On Alibaba Cloud](https://www.aliyun.com/product/bigdata/product/learn) | [@2sin18](yuanman.ym@alibaba-inc.com) | Production | PAI Deep Learning Containers |
13+
| [4Paradigm.com](http://www.4paradigm.com/) | [@mahao](https://github.com/mahao) | Testing | 4Paradigm Sage EE |
14+
| [PITS Globale Datenrettungsdienste](https://www.pitsdatenrettung.de/) | [@arnoldberlin](https://github.com/arnoldberlin) | Testing | ML & Kubernetes |
15+
| [BossZhipin](https://www.zhipin.com/) | [@lilyzhoupeijie](https://github.com/lilyzhoupeijie) | Staging | Alsenal AI Platform |
16+
| [China Telecom](https://www.chinatelecom-h.com/en/global/home.php) | [@yangyuliufeng](https://github.com/yangyuliufeng) | Staging | AI Platform on k8s |
17+
| [HAOMO](http://haomo.ai/) | [@tongyan](https://github.com/tongyan) | Testing | HAOMO Auto Machine Learning Platform |
18+
| [Platform of Artificial Intelligence On Alibaba Cloud](https://www.aliyun.com/product/bigdata/product/learn) | [@2sin18](https://github.com/2sin18) | Production | PAI Deep Learning Containers |
1919
| [Qihoo 360](http://www.360.cn/) | [@yuchang](https://github.com/70data) | Production | BigData platform |
20-
| [TencentCloud](https://cloud.tencent.com/) | [@xieydd](chrisydxie@tencent.com) | Testing | Tencent Kubernetes Engine |
21-
| [Unisound](https://www.unisound.com/) | [@ldd91](lvdongdong@unisound.com) | Staging | Atlas Deep Learning Platform |
22-
| [Weibo](http://www.weibo.com/) | [@wutong]([email protected].com) | Production | weibo deep learning platform |
23-
| [bilibili](http://www.bilibili.com/) | [@umialpha](lilei06@bilibili.com) | Production | bilibili AI platform |
20+
| [TencentCloud](https://cloud.tencent.com/) | [@xieydd](https://github.com/xieydd) | Testing | Tencent Kubernetes Engine |
21+
| [Unisound](https://www.unisound.com/) | [@ldd91](https://github.com/ldd91) | Staging | Atlas Deep Learning Platform |
22+
| [Weibo](http://www.weibo.com/) | [@wutong](https://github.com/wutong) | Production | weibo deep learning platform |
23+
| [bilibili](http://www.bilibili.com/) | [@umialpha](https://github.com/umialpha) | Production | bilibili AI platform |
2424
| [AnalyticDB On Alibaba Cloud](https://www.aliyun.com/product/ApsaraDB/ads) | [@daomin885]([email protected]) | Production | LakeCache Containers |
25-
| [鹏行智能](https://www.pxing.com/) | [@chenhuaicong](chenhc@pxing.com) | Testing | Pxing AI training platform |
26-
| [数元灵](https://www.dmetasoul.com/) | [@xuzhiwei](xuzw@dmetasoul.com) | Testing | MetaSpore distributed multimodal AI platform |
25+
| [鹏行智能](https://www.pxing.com/) | [@chenhuaicong](https://github.com/chenhuaicong) | Testing | Pxing AI training platform |
26+
| [数元灵](https://www.dmetasoul.com/) | [@xuzhiwei](https://github.com/xuzhiwei) | Testing | MetaSpore distributed multimodal AI platform |
2727
| [Gaussian Robotics](https://www.gaussianrobotics.com/) | [@gaohairong]([email protected]) | Testing | AI Platform on k8s |
28-
| [Metaapp](https://www.metaapp.cn/) | [@xzbcodelife](xzbzxcasdf@163.com) | Testing | Recommendation |
28+
| [Metaapp](https://www.metaapp.cn/) | [@xzbcodelife](https://github.com/xzbcodelife) | Testing | Recommendation |
2929
| [Baidu AI Cloud](https://cloud.baidu.com/) | [@abowloflrf](https://github.com/abowloflrf) | Staging | Cloud Container Engine |
3030
| [Envision](https://www.envision-group.com/cn/digital.html) | [@shaoxuefeng](https://github.com/shaoxuefeng) | Testing | AI Platform on k8s |
3131
| [Metabit Trading](https://www.metabit-trading.com) | [@jianhong](https://github.com/jianhong-metabit) | Production | AI Platform on k8s |
3232
| [Zhejiang Lab](https://www.zhejianglab.com) | [@hongchen](https://github.com/hongchenokok) | Testing | AI Platform on k8s |
3333
| [XIAOMI](https://www.mi.com/) | [@PeterChg](https://github.com/PeterChg) | Staging | Cloudml AI Platform |
34-
| [Soul APP](https://soulapp.cn/) | [@mornight]([email protected]) | Testing | AI Platform on k8s |
35-
| [HUYA](https://www.huya.com) | [@BobLiu20](liubofang@huya.com) | Production | AI Platform on k8s |
36-
| [OPPO](https://www.oppo.com) | [@laibruce](laiyanhui@oppo.com) | Production | Data acceleration |
37-
| [CloudView](https://cloudview.mobi) | [@kastland](kastland@126.com) | Production | AI Platform on k8s |
38-
| [Inceptio](https://www.inceptio.ai) | [@willwu](wusnong@163.com) | Production | Bigdata Platform and Autonomous Driving Simulation Platform |
34+
| [Soul APP](https://soulapp.cn/) | [@mornight](https://github.com/mornight) | Testing | AI Platform on k8s |
35+
| [HUYA](https://www.huya.com) | [@BobLiu20](https://github.com/BobLiu20) | Production | AI Platform on k8s |
36+
| [OPPO](https://www.oppo.com) | [@laibruce](https://github.com/laibruce) | Production | Data acceleration |
37+
| [CloudView](https://cloudview.mobi) | [@kastland](https://github.com/kastland) | Production | AI Platform on k8s |
38+
| [Inceptio](https://www.inceptio.ai) | [@willwu](https://github.com/willwu) | Production | Bigdata Platform and Autonomous Driving Simulation Platform |
3939
| [autelrobotics](https://www.autelrobotics.cn) | [@andyzheung](https://github.com/andyzheung) | Testing | AI platform training data cache and big emr job data process data cache |
4040
| [coScene](https://www.coscene.cn) | [@juchaosong](https://github.com/juchaosong) | Production | Data Platform on k8s |
41-
| [pvmed](https://www.pvmedtech.com/) | [@huozhuoliang](huozhuoliang@pvmedtech.com) | Testing | AI training platform|
42-
| [DPTechnology](https://www.dp.tech/) | [@liyangbing]([email protected]) | Production | AI Platform on k8s|
43-
| [Megvii](https://megvii.com/) | [@huangweixiao](huangweixiao@megvii.com) | Testing | AI Platform on k8s|
44-
| [图森未来](https://cn.tusimple.com/) | [@bojian]([email protected]) | Testing | Elastic Container Orchestration Service on k8s |
45-
| [得物](https://dewu.com/) | [@wangweidong](wangweidong@shizhuang-inc.com) | Staging | AI Platform(KubeAI) on k8s |
46-
| [KubeDL](https://kubedl.io/) | [@SimonCqk](cqk0100@gmail.com) | Production | AI Training/Big Data/Stream Media Platforms In Aicheng Technology At Large Scale |
47-
| [liblibai](https://liblib.ai) | [@zxj](zxj861216@163.com) | Production | AIGC Platform on k8s |
41+
| [pvmed](https://www.pvmedtech.com/) | [@huozhuoliang](https://github.com/huozhuoliang) | Testing | AI training platform|
42+
| [DPTechnology](https://www.dp.tech/) | [@liyangbing](https://github.com/liyangbing) | Production | AI Platform on k8s|
43+
| [Megvii](https://megvii.com/) | [@huangweixiao](https://github.com/huangweixiao) | Testing | AI Platform on k8s|
44+
| [图森未来](https://cn.tusimple.com/) | [@bojian](https://github.com/bojian) | Testing | Elastic Container Orchestration Service on k8s |
45+
| [得物](https://dewu.com/) | [@wangweidong](https://github.com/wangweidong) | Staging | AI Platform(KubeAI) on k8s |
46+
| [KubeDL](https://kubedl.io/) | [@SimonCqk](https://github.com/SimonCqk) | Production | AI Training/Big Data/Stream Media Platforms In Aicheng Technology At Large Scale |
47+
| [liblibai](https://liblib.ai) | [@zxj](https://github.com/zxj) | Production | AIGC Platform on k8s |
4848
| [HappyElements](https://www.happyelements.com) | [@Luckyboys](https://github.com/Luckyboys) | Production | AIGC Platform on k8s |
4949
| [JoinQuant](https://www.joinquant.com/) | [@David-Xiang](https://github.com/David-Xiang) | Production | AI Platform on k8s |
5050
| [Aliyun E-MapReduce](https://help.aliyun.com/en/emr/) | [@frankleaf](https://github.com/frankleaf) | Production | Accelerate Spark Service on BigData |
51-
| [数慧时空](https://diit.cn/) | [@zery](zerix.os@gmail.com) | Production | DataFabric System Storage Cache Layer |
51+
| [数慧时空](https://diit.cn/) | [@zery](https://github.com/zery) | Production | DataFabric System Storage Cache Layer |
5252
| [同花顺](https://www.10jqka.com.cn/) | [@seriousgong](https://github.com/seriousgong) | Production | AI Platform on k8s |
5353
| [地平线](https://www.horizon.auto/) | [@chenyangxueHDU](https://github.com/chenyangxueHDU) | Production | AI Platform on k8s |

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ You are warmly welcome if you'd like to join our community as a member. Together
128128
**Some requirements are needed to join our community:**
129129

130130
- Have read [Contributing to Fluid](CONTRIBUTING.md) carefully
131-
- Promise to observe our [code of conduct](code-of-conduct.md)
131+
- Promise to observe our [code of conduct](CODE_OF_CONDUCT.md)
132132
- Have submitted multiple PRs to Fluid
133133
- Be active in the community, including but not limited to:
134134
- Open new issues

0 commit comments

Comments
 (0)