From e57c8315107605ad9817f4bdc57223d0da02522d Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 1 Jul 2025 17:16:22 +0800 Subject: [PATCH] chore(deps): bump client-rs to v1.0.0 and bump console to v0.2.8 (#4172) Signed-off-by: Gaius --- .github/workflows/compatibility-e2e.yml | 8 +- Makefile | 56 ++----------- build/package/docs/dfcache/dfcache-delete.1 | 2 +- build/package/docs/dfcache/dfcache-doc.1 | 2 +- build/package/docs/dfcache/dfcache-export.1 | 2 +- build/package/docs/dfcache/dfcache-import.1 | 2 +- build/package/docs/dfcache/dfcache-plugin.1 | 2 +- build/package/docs/dfcache/dfcache-stat.1 | 2 +- build/package/docs/dfcache/dfcache-version.1 | 2 +- build/package/docs/dfcache/dfcache.1 | 2 +- build/package/docs/dfcache/dfcache.md | 2 +- build/package/docs/dfcache/dfcache_delete.md | 2 +- build/package/docs/dfcache/dfcache_doc.md | 2 +- build/package/docs/dfcache/dfcache_export.md | 2 +- build/package/docs/dfcache/dfcache_import.md | 2 +- build/package/docs/dfcache/dfcache_plugin.md | 2 +- build/package/docs/dfcache/dfcache_stat.md | 2 +- build/package/docs/dfcache/dfcache_version.md | 2 +- build/package/docs/dfget.1 | 2 +- build/package/docs/dfget.1.md | 2 +- build/package/docs/dfstore/dfstore-copy.1 | 2 +- build/package/docs/dfstore/dfstore-remove.1 | 2 +- build/package/docs/dfstore/dfstore-version.1 | 2 +- build/package/docs/dfstore/dfstore.1 | 2 +- build/package/docs/dfstore/dfstore.md | 2 +- build/package/docs/dfstore/dfstore_copy.md | 2 +- build/package/docs/dfstore/dfstore_remove.md | 2 +- build/package/docs/dfstore/dfstore_version.md | 2 +- client-rs | 2 +- deploy/helm-charts | 2 +- hack/install-e2e-test.sh | 81 ------------------- hack/kind-load.sh | 27 ------- manager/console | 2 +- version/version.go | 4 +- 34 files changed, 40 insertions(+), 194 deletions(-) delete mode 100755 hack/install-e2e-test.sh delete mode 100755 hack/kind-load.sh diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml index 1f12b7205..c71a1a66e 100644 --- a/.github/workflows/compatibility-e2e.yml +++ b/.github/workflows/compatibility-e2e.yml @@ -31,22 +31,22 @@ jobs: include: - module: manager image: manager - image-tag: v2.2.1 + image-tag: v2.2.4 chart-name: manager skip: "Rate Limit | preheat files in cache" - module: scheduler image: scheduler - image-tag: v2.2.1 + image-tag: v2.2.4 chart-name: scheduler skip: "Rate Limit | preheat files in cache" - module: client image: client - image-tag: v0.2.31 + image-tag: v1.0.0 chart-name: client skip: "Rate Limit" - module: seed-client image: client - image-tag: v0.2.31 + image-tag: v1.0.0 chart-name: seed-client skip: "Rate Limit" diff --git a/Makefile b/Makefile index 282d668ad..669870910 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ PROJECT_NAME := "d7y.io/dragonfly/v2" DFGET_NAME := "dfget" DFCACHE_NAME := "dfcache" DFSTORE_NAME := "dfstore" -SEMVER := "2.2.0" +SEMVER := "2.3.0" VERSION_RELEASE := "1" PKG := "$(PROJECT_NAME)" PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/ | grep -v '\(/test/\)') @@ -34,21 +34,15 @@ build-dirs: .PHONY: build-dirs # Build dragonfly. -docker-build: docker-build-dfdaemon docker-build-scheduler docker-build-manager +docker-build: docker-build-scheduler docker-build-manager @echo "Build image done." .PHONY: docker-build # Push dragonfly images. -docker-push: docker-push-dfdaemon docker-push-scheduler docker-push-manager +docker-push: docker-push-scheduler docker-push-manager @echo "Push image done." .PHONY: docker-push -# Build dfdaemon image. -docker-build-dfdaemon: - @echo "Begin to use docker build dfdaemon image." - ./hack/docker-build.sh dfdaemon -.PHONY: docker-build-dfdaemon - # Build scheduler image. docker-build-scheduler: @echo "Begin to use docker build scheduler image." @@ -61,12 +55,6 @@ docker-build-manager: ./hack/docker-build.sh manager .PHONY: docker-build-manager -# Push dfdaemon image. -docker-push-dfdaemon: docker-build-dfdaemon - @echo "Begin to push dfdaemon docker image." - ./hack/docker-push.sh dfdaemon -.PHONY: docker-push-dfdaemon - # Push scheduler image. docker-push-scheduler: docker-build-scheduler @echo "Begin to push scheduler docker image." @@ -309,49 +297,23 @@ actions-e2e-test-coverage: @cat coverprofile.out >> coverage.txt .PHONY: actions-e2e-test-coverage -# Install E2E tests environment. -install-e2e-test: - @./hack/install-e2e-test.sh -.PHONY: install-e2e-test - # Run E2E tests. -e2e-test: install-e2e-test build-e2e-sha256sum +e2e-test: @ginkgo -v -r --race --fail-fast --cover --trace --show-node-events test/e2e .PHONY: e2e-test # Run E2E tests with coverage. -e2e-test-coverage: install-e2e-test build-e2e-sha256sum +e2e-test-coverage: @ginkgo -v -r --race --fail-fast --cover --trace --show-node-events test/e2e @cat coverprofile.out >> coverage.txt .PHONY: e2e-test-coverage # Clean E2E tests. clean-e2e-test: - @kind delete cluster @echo "cleaning log file." @rm -rf test/e2e/*.log .PHONY: clean-e2e-test -# Kind load dragonfly. -kind-load: kind-load-scheduler kind-load-dfdaemon kind-load-manager - @echo "Kind load image done." -.PHONY: kind-load - -# Run kind load docker scheduler. -kind-load-scheduler: - @./hack/kind-load.sh scheduler -.PHONY: kind-load-scheduler - -# Run kind load docker dfget. -kind-load-dfdaemon: - @./hack/kind-load.sh dfdaemon -.PHONY: kind-load-dfget - -# Run kind load docker manager. -kind-load-manager: - @./hack/kind-load.sh manager -.PHONY: kind-load-manager - # Run code lint. lint: markdownlint @echo "Begin to golangci-lint." @@ -388,10 +350,8 @@ help: @echo "make build-dirs prepare required folders for build" @echo "make docker-build build dragonfly image" @echo "make docker-push push dragonfly image" - @echo "make docker-build-dfdaemon build dfdaemon image" @echo "make docker-build-scheduler build scheduler image" @echo "make docker-build-manager build manager image" - @echo "make docker-push-dfdaemon push dfdaemon image" @echo "make docker-push-scheduler push scheduler image" @echo "make docker-push-manager push manager image" @echo "make build build dragonfly" @@ -405,7 +365,6 @@ help: @echo "make build-manager build manager" @echo "make build-manager-server build manager server" @echo "make build-manager-console build manager console" - @echo "make build-e2e-sha256sum build sha256sum test tool" @echo "make install-dfget install dfget" @echo "make install-scheduler install scheduler" @echo "make install-manager install manager" @@ -422,14 +381,9 @@ help: @echo "make test run unit tests" @echo "make test-coverage run tests with coverage" @echo "make actions-e2e-test-coverage run github actons E2E tests with coverage" - @echo "make install-e2e-test install E2E tests environment" @echo "make e2e-test run e2e tests" @echo "make e2e-test-coverage run e2e tests with coverage" @echo "make clean-e2e-test clean e2e tests" - @echo "make kind-load kind load docker image" - @echo "make kind-load-scheduler kind load scheduler docker image" - @echo "make kind-load-dfdaemon kind load dfdaemon docker image" - @echo "make kind-load-manager kind load manager docker image" @echo "make lint run code lint" @echo "make markdownlint run markdown lint" @echo "make generate run go generate" diff --git a/build/package/docs/dfcache/dfcache-delete.1 b/build/package/docs/dfcache/dfcache-delete.1 index 3ea9d35f8..5cd89fe29 100644 --- a/build/package/docs/dfcache/dfcache-delete.1 +++ b/build/package/docs/dfcache/dfcache-delete.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache delete\f[R] \(em delete file from P2P cache system .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache-doc.1 b/build/package/docs/dfcache/dfcache-doc.1 index 6f620dd83..e76680ad0 100644 --- a/build/package/docs/dfcache/dfcache-doc.1 +++ b/build/package/docs/dfcache/dfcache-doc.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache doc\f[R] \(em generate documents .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache-export.1 b/build/package/docs/dfcache/dfcache-export.1 index 5d425c2e5..e312a1f86 100644 --- a/build/package/docs/dfcache/dfcache-export.1 +++ b/build/package/docs/dfcache/dfcache-export.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache export\f[R] \(em export file from P2P cache system .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache-import.1 b/build/package/docs/dfcache/dfcache-import.1 index 795e555e2..e474cfa3e 100644 --- a/build/package/docs/dfcache/dfcache-import.1 +++ b/build/package/docs/dfcache/dfcache-import.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache import\f[R] \(em import file into P2P cache system .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache-plugin.1 b/build/package/docs/dfcache/dfcache-plugin.1 index 7cbd7f387..63a72be9b 100644 --- a/build/package/docs/dfcache/dfcache-plugin.1 +++ b/build/package/docs/dfcache/dfcache-plugin.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache plugin\f[R] \(em show plugin .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache-stat.1 b/build/package/docs/dfcache/dfcache-stat.1 index 57cfa7ee4..56bcd6358 100644 --- a/build/package/docs/dfcache/dfcache-stat.1 +++ b/build/package/docs/dfcache/dfcache-stat.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache stat\f[R] \(em stat checks if a file exists in P2P cache system diff --git a/build/package/docs/dfcache/dfcache-version.1 b/build/package/docs/dfcache/dfcache-version.1 index 76aac1020..cf653682d 100644 --- a/build/package/docs/dfcache/dfcache-version.1 +++ b/build/package/docs/dfcache/dfcache-version.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache version\f[R] \(em show version .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache.1 b/build/package/docs/dfcache/dfcache.1 index 0b89e6c49..3c480a9b1 100644 --- a/build/package/docs/dfcache/dfcache.1 +++ b/build/package/docs/dfcache/dfcache.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfcache\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfcache\(rq Documentation" .SH NAME \f[B]dfcache\f[R] \(em the P2P cache client of dragonfly .SH SYNOPSIS diff --git a/build/package/docs/dfcache/dfcache.md b/build/package/docs/dfcache/dfcache.md index ada8bad5d..5f47df7a9 100644 --- a/build/package/docs/dfcache/dfcache.md +++ b/build/package/docs/dfcache/dfcache.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_delete.md b/build/package/docs/dfcache/dfcache_delete.md index 528319047..5b454b4aa 100644 --- a/build/package/docs/dfcache/dfcache_delete.md +++ b/build/package/docs/dfcache/dfcache_delete.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_doc.md b/build/package/docs/dfcache/dfcache_doc.md index 7b57cc799..0ccc55247 100644 --- a/build/package/docs/dfcache/dfcache_doc.md +++ b/build/package/docs/dfcache/dfcache_doc.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_export.md b/build/package/docs/dfcache/dfcache_export.md index f203f5ae8..fe9137b3e 100644 --- a/build/package/docs/dfcache/dfcache_export.md +++ b/build/package/docs/dfcache/dfcache_export.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_import.md b/build/package/docs/dfcache/dfcache_import.md index d852e4729..22093ecec 100644 --- a/build/package/docs/dfcache/dfcache_import.md +++ b/build/package/docs/dfcache/dfcache_import.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_plugin.md b/build/package/docs/dfcache/dfcache_plugin.md index 8a00b0d8a..9bc4dba36 100644 --- a/build/package/docs/dfcache/dfcache_plugin.md +++ b/build/package/docs/dfcache/dfcache_plugin.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_stat.md b/build/package/docs/dfcache/dfcache_stat.md index 70f082917..b74d57730 100644 --- a/build/package/docs/dfcache/dfcache_stat.md +++ b/build/package/docs/dfcache/dfcache_stat.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfcache/dfcache_version.md b/build/package/docs/dfcache/dfcache_version.md index 0016af289..a11037962 100644 --- a/build/package/docs/dfcache/dfcache_version.md +++ b/build/package/docs/dfcache/dfcache_version.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfcache" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfcache" Documentation # NAME diff --git a/build/package/docs/dfget.1 b/build/package/docs/dfget.1 index 6ff8c61e3..d3f414bfd 100644 --- a/build/package/docs/dfget.1 +++ b/build/package/docs/dfget.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFGET" "1" "" "Version v2.2.0" "Frivolous \(lqDfget\(rq Documentation" +.TH "DFGET" "1" "" "Version v2.3.0" "Frivolous \(lqDfget\(rq Documentation" .SH NAME \f[B]dfget\f[R] \(em client of Dragonfly used to download and upload files diff --git a/build/package/docs/dfget.1.md b/build/package/docs/dfget.1.md index a22ebbb39..fcbf312da 100644 --- a/build/package/docs/dfget.1.md +++ b/build/package/docs/dfget.1.md @@ -1,4 +1,4 @@ -% DFGET(1) Version v2.2.0 | Frivolous "Dfget" Documentation +% DFGET(1) Version v2.3.0 | Frivolous "Dfget" Documentation # NAME diff --git a/build/package/docs/dfstore/dfstore-copy.1 b/build/package/docs/dfstore/dfstore-copy.1 index bc7b215d3..4029adf82 100644 --- a/build/package/docs/dfstore/dfstore-copy.1 +++ b/build/package/docs/dfstore/dfstore-copy.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfstore\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfstore\(rq Documentation" .SH NAME \f[B]dfstore cp\f[R] \(em copies a local file or dragonfly object to another location locally or in dragonfly object storage diff --git a/build/package/docs/dfstore/dfstore-remove.1 b/build/package/docs/dfstore/dfstore-remove.1 index 693ea2115..14ebeb69b 100644 --- a/build/package/docs/dfstore/dfstore-remove.1 +++ b/build/package/docs/dfstore/dfstore-remove.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfstore\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfstore\(rq Documentation" .SH NAME \f[B]dfstore rm\f[R] \(em remove object from P2P storage system .SH SYNOPSIS diff --git a/build/package/docs/dfstore/dfstore-version.1 b/build/package/docs/dfstore/dfstore-version.1 index 9b19aa193..1a2a4dce7 100644 --- a/build/package/docs/dfstore/dfstore-version.1 +++ b/build/package/docs/dfstore/dfstore-version.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfstore\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfstore\(rq Documentation" .SH NAME \f[B]dfstore version\f[R] \(em show version .SH SYNOPSIS diff --git a/build/package/docs/dfstore/dfstore.1 b/build/package/docs/dfstore/dfstore.1 index ae6b90d9a..27d012e3b 100644 --- a/build/package/docs/dfstore/dfstore.1 +++ b/build/package/docs/dfstore/dfstore.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.7.0.1 .\" -.TH "DFCACHE" "1" "" "Version v2.2.0" "Frivolous \(lqDfstore\(rq Documentation" +.TH "DFCACHE" "1" "" "Version v2.3.0" "Frivolous \(lqDfstore\(rq Documentation" .SH NAME \f[B]dfstore\f[R] \(em object storage client of dragonfly .SH SYNOPSIS diff --git a/build/package/docs/dfstore/dfstore.md b/build/package/docs/dfstore/dfstore.md index c9652a71b..177474e14 100644 --- a/build/package/docs/dfstore/dfstore.md +++ b/build/package/docs/dfstore/dfstore.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfstore" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfstore" Documentation # NAME diff --git a/build/package/docs/dfstore/dfstore_copy.md b/build/package/docs/dfstore/dfstore_copy.md index e4b1a4749..05b3b888d 100644 --- a/build/package/docs/dfstore/dfstore_copy.md +++ b/build/package/docs/dfstore/dfstore_copy.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfstore" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfstore" Documentation # NAME diff --git a/build/package/docs/dfstore/dfstore_remove.md b/build/package/docs/dfstore/dfstore_remove.md index 3766ca984..bd816e0af 100644 --- a/build/package/docs/dfstore/dfstore_remove.md +++ b/build/package/docs/dfstore/dfstore_remove.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfstore" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfstore" Documentation # NAME diff --git a/build/package/docs/dfstore/dfstore_version.md b/build/package/docs/dfstore/dfstore_version.md index 5b709a358..ee1877f9f 100644 --- a/build/package/docs/dfstore/dfstore_version.md +++ b/build/package/docs/dfstore/dfstore_version.md @@ -1,4 +1,4 @@ -% DFCACHE(1) Version v2.2.0 | Frivolous "Dfstore" Documentation +% DFCACHE(1) Version v2.3.0 | Frivolous "Dfstore" Documentation # NAME diff --git a/client-rs b/client-rs index cec340712..7cf69832a 160000 --- a/client-rs +++ b/client-rs @@ -1 +1 @@ -Subproject commit cec3407126f7196c9719c5d358d2f8c63bfa69ea +Subproject commit 7cf69832a842a683a01c9c3ff9aed354bb72ff8e diff --git a/deploy/helm-charts b/deploy/helm-charts index 8aceed545..7afe3b697 160000 --- a/deploy/helm-charts +++ b/deploy/helm-charts @@ -1 +1 @@ -Subproject commit 8aceed5453d2b7ad2656f10f1b06cca3e45c0e97 +Subproject commit 7afe3b697e53c66ec844f7a6ae7e4f9f63e3b866 diff --git a/hack/install-e2e-test.sh b/hack/install-e2e-test.sh deleted file mode 100755 index 32b4430b8..000000000 --- a/hack/install-e2e-test.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -KIND_CONFIG_PATH="test/testdata/kind/config.yaml" -CHARTS_CONFIG_PATH="test/testdata/charts/config.yaml" -CHARTS_PATH="deploy/helm-charts/charts/dragonfly" -NAMESPACE="dragonfly-system" -E2E_NAMESPACE="dragonfly-e2e" -FILE_SERVER_NAME="file-server-0" -curDir=$(cd "$(dirname "$0")" && pwd) -cd "${curDir}/../" || return - -install-kind() { - if which kind >/dev/null ; then - print_step_info "kind has been installed" - else - print_step_info "start install kind" - go install sigs.k8s.io/kind@v0.11.1 - fi - - kind create cluster --config ${KIND_CONFIG_PATH} -} - -install-helm() { - if which helm >/dev/null ; then - print_step_info "helm has been installed" - else - print_step_info "start install helm" - curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | sh - fi - - helm upgrade --install --wait --timeout 10m --dependency-update --create-namespace --namespace ${NAMESPACE} -f ${CHARTS_CONFIG_PATH} dragonfly ${CHARTS_PATH} -} - -install-ginkgo() { - if which ginkgo >/dev/null ; then - print_step_info "ginkgo has been installed" - else - go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0 - fi -} - -install-apache-bench() { - if which ab >/dev/null ; then - print_step_info "apache bench has been installed" - else - apt-get update - apt-get install apache2-utils - fi -} - -print_step_info() { - echo "-----------------------------" - echo $1 - echo "-----------------------------" -} - -main() { - print_step_info "start kind create cluster" - install-kind - - print_step_info "start building docker images" - make docker-build docker-build-testing-tools - - print_step_info "start loading image for kind" - make kind-load - - print_step_info "start helm install dragonfly" - install-helm - - print_step_info "start install ginkgo" - install-ginkgo - - print_step_info "start install apache bench" - install-apache-bench -} - -main "$@" diff --git a/hack/kind-load.sh b/hack/kind-load.sh deleted file mode 100755 index 920b5395e..000000000 --- a/hack/kind-load.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -D7Y_VERSION=${D7Y_VERSION:-"latest"} -D7Y_REGISTRY=${D7Y_REGISTRY:-dragonflyoss} - -kind-load() { - kind load docker-image "${D7Y_REGISTRY}"/"${1}":"${D7Y_VERSION}" || { echo >&2 "load docker image error"; exit 1; } -} - -main() { - case "${1-}" in - dfdaemon) - kind-load dfdaemon - ;; - scheduler) - kind-load scheduler - ;; - manager) - kind-load manager - esac -} - -main "$@" diff --git a/manager/console b/manager/console index 499ef7f82..5d943d8ae 160000 --- a/manager/console +++ b/manager/console @@ -1 +1 @@ -Subproject commit 499ef7f82d94b69477b1a4bcad793f6b59ab0569 +Subproject commit 5d943d8aeadbd571b35993f3df0844f7a41d85d4 diff --git a/version/version.go b/version/version.go index 822edb085..a1957ae32 100644 --- a/version/version.go +++ b/version/version.go @@ -22,8 +22,8 @@ import ( var ( Major = "2" - Minor = "0" - GitVersion = "v2.2.0" + Minor = "3" + GitVersion = "v2.3.0" GitCommit = "unknown" Platform = osArch BuildTime = "unknown"