Merge branch 'labring:main' into main

lingdie · Oct 21, 2024 · 1c36083 · 1c36083
2 parents 0adf931 + e1df7ce
commit 1c36083
Show file tree

Hide file tree

Showing 130 changed files with 502 additions and 6,297 deletions.
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
diff --git a/controllers/account/api/v1/billingrecordquery_types.go b/controllers/account/api/v1/billingrecordquery_types.go
diff --git a/controllers/account/api/v1/debt_webhook.go b/controllers/account/api/v1/debt_webhook.go
@@ -54,7 +54,7 @@ const (
 
 var logger = logf.Log.WithName("debt-resource")
 
-//+kubebuilder:webhook:path=/validate-v1-sealos-cloud,mutating=false,failurePolicy=ignore,groups="*",resources=*,verbs=create;update;delete,versions=v1,name=debt.sealos.io,admissionReviewVersions=v1,sideEffects=None
+//+kubebuilder:webhook:path=/validate-v1-sealos-cloud,mutating=false,failurePolicy=ignore,groups="*",resources=*,verbs=create;update;delete,versions=v1,name=debt.sealos.io,admissionReviewVersions=v1,sideEffects=None,timeoutSeconds=10
 // +kubebuilder:object:generate=false
 
 type DebtValidate struct {

diff --git a/controllers/account/api/v1/namespacebillinghistory_types.go b/controllers/account/api/v1/namespacebillinghistory_types.go