Merge remote-tracking branch 'upstream/main' into test

labring · Oct 31, 2024 · 4daeda1 · 4daeda1
2 parents ce8dce5 + e6a2f8b
commit 4daeda1
Show file tree

Hide file tree

Showing 389 changed files with 8,373 additions and 9,095 deletions.
diff --git a/.github/workflows/cloud-release.yml b/.github/workflows/cloud-release.yml
@@ -3,6 +3,17 @@ name: Release Cloud
 on:
   release:
     types: [ published ]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag for manual release'
+        required: false
+        default: ''
+      build_offline_tar_only:
+        description: 'Build offline tar only'
+        required: false
+        default: false
+        type: boolean
 
 env:
   # Common versions
@@ -14,29 +25,33 @@ jobs:
     uses: ./.github/workflows/import-save-sealos.yml
 
   release-controllers:
+    if: ${{ github.event.inputs.build_offline_tar_only == false }}
     uses: ./.github/workflows/controllers.yml
     with:
       push_image: true
-      push_image_tag: ${{ github.event.release.tag_name }}
+      push_image_tag: ${{ github.event.inputs.tag || github.event.release.tag_name }}
     secrets: inherit
 
   release-frontends:
+    if: ${{ github.event.inputs.build_offline_tar_only == false }}
     uses: ./.github/workflows/frontend.yml
     with:
       push_image: true
-      push_image_tag: ${{ github.event.release.tag_name }}
+      push_image_tag: ${{ github.event.inputs.tag || github.event.release.tag_name }}
     secrets: inherit
 
   release-service:
+    if: ${{ github.event.inputs.build_offline_tar_only == false }}
     needs:
       - save-sealos
     uses: ./.github/workflows/services.yml
     with:
       push_image: true
-      push_image_tag: ${{ github.event.release.tag_name }}
+      push_image_tag: ${{ github.event.inputs.tag || github.event.release.tag_name }}
     secrets: inherit
 
   release-cloud:
+    if: ${{ github.event.inputs.build_offline_tar_only == false }}
     needs:
       - save-sealos
       - release-controllers
@@ -45,14 +60,17 @@ jobs:
     uses: ./.github/workflows/cloud.yml
     with:
       push_image: true
-      push_image_tag: ${{ github.event.release.tag_name }}
-      build_from: ${{ github.event.release.tag_name }}
+      push_image_tag: ${{ github.event.inputs.tag || github.event.release.tag_name }}
+      build_from: ${{ github.event.inputs.tag || github.event.release.tag_name }}
     secrets: inherit
 
   release-amd-offline-tar:
     needs:
       - release-cloud
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+    env:
+      RELEASE_TAG: ${{ github.event.inputs.tag || github.event.release.tag_name }}
+      OSS_BUCKET: ${{ secrets.OSS_BUCKET }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -67,7 +85,11 @@ jobs:
           sudo mv /tmp/sealos /usr/bin/sealos
           sudo sealos version
       - name: Build
-        run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && export ARCH=amd64 && bash ./scripts/cloud/build-offline-tar.sh
+        run: |
+          export CLOUD_VERSION="$RELEASE_TAG"
+          export VERSION="$RELEASE_TAG"
+          export ARCH=amd64
+          bash ./scripts/cloud/build-offline-tar.sh
       - name: Setup ossutil
         uses: manyuanrong/[email protected]
         with:
@@ -78,13 +100,16 @@ jobs:
         run: cat ./sealos-cloud.tar.gz.md5
       - name: Upload
         run: |
-          ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-amd64.tar.gz
-          ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-amd64.tar.gz.md5
+          ossutil cp ./sealos-cloud.tar.gz "oss://$OSS_BUCKET/cloud/sealos-cloud-$RELEASE_TAG-amd64.tar.gz"
+          ossutil cp ./sealos-cloud.tar.gz.md5 "oss://$OSS_BUCKET/cloud/sealos-cloud-$RELEASE_TAG-amd64.tar.gz.md5"
 
   release-arm-offline-tar:
     needs:
       - release-cloud
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+    env:
+      RELEASE_TAG: ${{ github.event.inputs.tag || github.event.release.tag_name }}
+      OSS_BUCKET: ${{ secrets.OSS_BUCKET }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -99,7 +124,11 @@ jobs:
           sudo mv /tmp/sealos /usr/bin/sealos
           sudo sealos version
       - name: Build
-        run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && export ARCH=arm64 && bash ./scripts/cloud/build-offline-tar.sh
+        run: |
+          export CLOUD_VERSION="$RELEASE_TAG"
+          export VERSION="$RELEASE_TAG"
+          export ARCH=arm64
+          bash ./scripts/cloud/build-offline-tar.sh
       - name: Setup ossutil
         uses: manyuanrong/[email protected]
         with:
@@ -110,5 +139,5 @@ jobs:
         run: cat ./sealos-cloud.tar.gz.md5
       - name: Upload
         run: |
-          ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz
-          ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz.md5
+          ossutil cp ./sealos-cloud.tar.gz "oss://$OSS_BUCKET/cloud/sealos-cloud-$RELEASE_TAG-arm64.tar.gz"
+          ossutil cp ./sealos-cloud.tar.gz.md5 "oss://$OSS_BUCKET/cloud/sealos-cloud-$RELEASE_TAG-arm64.tar.gz.md5"
diff --git a/CHANGELOG/CHANGELOG-5.0.1-beta2.md b/CHANGELOG/CHANGELOG-5.0.1-beta2.md
@@ -0,0 +1,32 @@
+Welcome to the v5.0.1-beta2 release of Sealos!🎉🎉!
+
+
+
+## Changelog
+### New Features
+* ebe7f51afe023810fc4e3538f4f2e46007d43002: feat: launchpad support secret userDomains (#5119) (@zjy365)
+### Bug fixes
+* 2fd2f07892660ce4fa0ad0e167082fbeb372d579: fix: cronjob arm64 image (#5113) (@zijiren233)
+* d3ba17bc4925707a32ae999e88019aaf3af23800: fix: node tls reject unauthorized (#5116) (@zijiren233)
+* bc0b5f72006a173f9bcac0e287fd9893efe728af: fix: some ui adjust and bug fix (#5097) (@mlhiter)
+### Other work
+* 8c0c34592369874ce178c956af713dba3c17a9ea: devobx ignore extra ports. (#5112) (@lingdie)
+* 1243fd31e8f2f8828e35f1c47e6e6cd19155ae3e: fix desktop and costcenter configs (#5114) (@xudaotutou)
+* 22d9a138f9a3f4cd04a4eb927639fd008972adff: fix devbox phase generate. (#5120) (@lingdie)
+* b6053c1c2601fafa0752cdaac4501606bd020a20: fix get default property (#5108) (@bxy4543)
+* 7b025ae80d215cd1fe860ed08bc69dc132185be3: fix init user (#5104) (@bxy4543)
+* d21832075623248f831df5f04b7a8962c3c83fb6: fix scripts: init account jwt secret (#5117) (@bxy4543)
+* 3081c5dc1abf65d751de29b52b1febeb3dbbad9a: fix(account-service): fix concurrency issue and add real name info api (#5103) (@HUAHUAI23)
+* 7b0be9352fa422f1abca8f232cd8c864db548f7e: release: sealos v5.0.1 beta2 (#5110) (@lingdie)
+* 7a4b7b91fe63b3b4747fc99d2753c1b7a409fd39: sealos v5.0.1-beta2 (#5071) (@lingdie)
+* 54a3bc28684df2f8427c2ff1cc3969a0dd79c534: style(costcenter): recharge discount (#5111) (@xudaotutou)
+* b78691a56704884d1da0544a2779b8f42b45d3f1: sync resourcequota objectstorage/size status used (#5102) (@nowinkeyy)
+* c80c265fd6838bbf071cefcfa077a4e4d0274fa4: 🤖 add release changelog using rebot. (#5100) (@sealos-release-robot)
+
+**Full Changelog**: https://github.com/labring/sealos/compare/v5.0.1-beta1...v5.0.1-beta2
+
+See [the CHANGELOG](https://github.com/labring/sealos/blob/main/CHANGELOG/CHANGELOG.md) for more details.
+
+Your patronage towards Sealos is greatly appreciated 🎉🎉.
+
+If you encounter any problems during its usage, please create an issue in the [GitHub repository](https://github.com/labring/sealos), we're committed to resolving your problem as soon as possible.
diff --git a/CHANGELOG/CHANGELOG-5.0.1.md b/CHANGELOG/CHANGELOG-5.0.1.md
@@ -0,0 +1,23 @@
+Welcome to the v5.0.1 release of Sealos!🎉🎉!
+
+
+
+## Changelog
+### New Features
+* 2b74a1281cdd72ec5f02a0cc9edf042639a1e054: feat: Implement app guide module (#5115) (@zjy365)
+### Bug fixes
+* 6489ce6a6d7aaf2aa24ee3514bacab924b0f31a9: fix(desktop):fix merge user (#5101) (@xudaotutou)
+### Other work
+* 351e7616134950859fe559c57499b6fdff67fa0d: Feat/active task (#5121) (@bxy4543)
+* 9817f6fb81b163f42c7d0b31f7e6350101b0f569: devbox cache improve. (#5122) (@lingdie)
+* d9b34cd60044590b6a5807d1725398017a735e19: fix build offline scripts and ci. (#5125) (@lingdie)
+* a9154f858db2b50ce72e1e0a6fc8b15a954d37a0: fix invaild (#5118) (@xudaotutou)
+* 56ffcb829d61b2d5531fe4bb544e17bbe12032ba: 🤖 add release changelog using rebot. (#5123) (@sealos-release-robot)
+
+**Full Changelog**: https://github.com/labring/sealos/compare/v5.0.1-beta3...v5.0.1
+
+See [the CHANGELOG](https://github.com/labring/sealos/blob/main/CHANGELOG/CHANGELOG.md) for more details.
+
+Your patronage towards Sealos is greatly appreciated 🎉🎉.
+
+If you encounter any problems during its usage, please create an issue in the [GitHub repository](https://github.com/labring/sealos), we're committed to resolving your problem as soon as possible.
diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+- [CHANGELOG-5.0.1-beta2.md](./CHANGELOG-5.0.1-beta2.md)
 - [CHANGELOG-5.0.1-beta1.md](./CHANGELOG-5.0.1-beta1.md)
+- [CHANGELOG-5.0.1.md](./CHANGELOG-5.0.1.md)
 - [CHANGELOG-5.0.0-beta5.md](./CHANGELOG-5.0.0-beta5.md)
 - [CHANGELOG-5.0.0-beta4.md](./CHANGELOG-5.0.0-beta4.md)
 - [CHANGELOG-5.0.0-beta3.md](./CHANGELOG-5.0.0-beta3.md)

diff --git a/cmd/sealos/cmd/reset.go b/cmd/sealos/cmd/reset.go
@@ -31,8 +31,8 @@ reset you current cluster:
 
 func newResetCmd() *cobra.Command {
 	resetArgs := &apply.ResetArgs{
-		Cluster: &apply.Cluster{},
-		SSH:     &apply.SSH{},
+		ClusterName: &apply.ClusterName{},
+		SSH:         &apply.SSH{},
 	}
 
 	var resetCmd = &cobra.Command{

diff --git a/controllers/account/Makefile b/controllers/account/Makefile
@@ -121,8 +121,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v4.2.0
-CONTROLLER_TOOLS_VERSION ?= v0.8.0
+KUSTOMIZE_VERSION ?= v5.3.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

diff --git a/controllers/account/PROJECT b/controllers/account/PROJECT
@@ -5,13 +5,10 @@ projectName: account
 repo: github.com/labring/sealos/controllers/account
 resources:
 - api:
-    crdVersion: v1
-    namespaced: true
   controller: true
   domain: sealos.io
   group: account
   kind: Account
-  path: github.com/labring/sealos/controllers/account/api/v1
   version: v1
 - api:
     crdVersion: v1
@@ -39,23 +36,6 @@ resources:
   group: account
   kind: Billing
   version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: sealos.io
-  group: account
-  kind: BillingRecordQuery
-  path: github.com/labring/sealos/controllers/account/api/v1
-  version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  domain: sealos.io
-  group: account
-  kind: PriceQuery
-  path: github.com/labring/sealos/controllers/account/api/v1
-  version: v1
 - controller: true
   group: core
   kind: Pod
@@ -66,31 +46,4 @@ resources:
   kind: Namespace
   path: k8s.io/api/core/v1
   version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: sealos.io
-  group: account
-  kind: Transfer
-  path: github.com/labring/sealos/controllers/account/api/v1
-  version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: sealos.io
-  group: account
-  kind: NamespaceBillingHistory
-  path: github.com/labring/sealos/controllers/account/api/v1
-  version: v1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: sealos.io
-  group: account
-  kind: BillingInfoQuery
-  path: github.com/labring/sealos/controllers/account/api/v1
-  version: v1
 version: "3"
diff --git a/controllers/account/api/v1/billinginfoquery_types.go b/controllers/account/api/v1/billinginfoquery_types.go