chore: remove deprecated class command (#305)

(cherry picked from commit f2e2e7c)
apecloud · Apr 8, 2024 · 5da0197 · 5da0197
1 parent c63dd2a
commit 5da0197
Show file tree

Hide file tree

Showing 41 changed files with 46 additions and 1,838 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "addons"]
 	path = addons
 	url = https://github.com/apecloud/kubeblocks-addons.git
-    branch = main
+    branch = release-0.9
diff --git a/addons b/addons
diff --git a/docs/user_docs/cli/kbcli_class.md b/docs/user_docs/cli/kbcli_class.md
diff --git a/docs/user_docs/cli/kbcli_class_create.md b/docs/user_docs/cli/kbcli_class_create.md
diff --git a/docs/user_docs/cli/kbcli_class_list.md b/docs/user_docs/cli/kbcli_class_list.md
diff --git a/docs/user_docs/cli/kbcli_class_template.md b/docs/user_docs/cli/kbcli_class_template.md
diff --git a/docs/user_docs/cli/kbcli_cluster_create.md b/docs/user_docs/cli/kbcli_cluster_create.md
@@ -125,7 +125,7 @@ kbcli cluster create [NAME] [flags]
       --rbac-enabled                           Specify whether rbac resources will be created by kbcli, otherwise KubeBlocks server will try to create rbac resources
       --restore-to-time string                 Set a time for point in time recovery
       --service-reference stringArray          Set the other KubeBlocks cluster dependencies, each '--service-reference' corresponds to a cluster service. (e.g --service-reference name=pulsarZookeeper,cluster=zookeeper,namespace=default)
-      --set stringArray                        Set the cluster resource including cpu, memory, replicas and storage, each set corresponds to a component.(e.g. --set cpu=1,memory=1Gi,replicas=3,storage=20Gi or --set class=general-1c1g)
+      --set stringArray                        Set the cluster resource including cpu, memory, replicas and storage, each set corresponds to a component.(e.g. --set cpu=1,memory=1Gi,replicas=3,storage=20Gi)
   -f, --set-file string                        Use yaml file, URL, or stdin to set the cluster resource
       --tenancy string                         Tenancy options, one of: (SharedNode, DedicatedNode) (default "SharedNode")
       --termination-policy string              Termination policy, one of: (DoNotTerminate, Halt, Delete, WipeOut) (default "Delete")

diff --git a/docs/user_docs/cli/kbcli_cluster_create_llm.md b/docs/user_docs/cli/kbcli_cluster_create_llm.md
@@ -23,7 +23,7 @@ kbcli cluster create llm NAME [flags]
 ```
       --availability-policy string   The availability policy of cluster. Legal values [none, node, zone]. (default "node")
       --cpu float                    CPU cores. Value range [0, 64].
-      --cpu-mode                     Set to true if no GPU is available
+      --cpu-mode                     Set to true if no GPU is available, default true (default true)
       --extra-args string            extra arguments that will be passed to run model (default "--trust-remote-code")
       --gpu float                    GPU cores. Value range [0, 64]. (default 1)
   -h, --help                         help for llm

diff --git a/docs/user_docs/cli/kbcli_cluster_vscale.md b/docs/user_docs/cli/kbcli_cluster_vscale.md
@@ -13,16 +13,12 @@ kbcli cluster vscale NAME [flags]
 ```
   # scale the computing resources of specified components, separate with commas for multiple components
   kbcli cluster vscale mycluster --components=mysql --cpu=500m --memory=500Mi
-  
-  # scale the computing resources of specified components by class, run command 'kbcli class list --cluster-definition cluster-definition-name' to get available classes
-  kbcli cluster vscale mycluster --components=mysql --class=general-2c4g
 ```
 
 ### Options
 
 ```
       --auto-approve                   Skip interactive approval before vertically scaling the cluster
-      --class string                   Component class
       --components strings             Component names to this operations
       --cpu string                     Request and limit size of component cpu
       --dry-run string[="unchanged"]   Must be "client", or "server". If with client strategy, only print the object that would be sent, and no data is actually sent. If with server strategy, submit the server-side request, but no data is persistent. (default "none")

diff --git a/pkg/action/template/cluster_operations_template.cue b/pkg/action/template/cluster_operations_template.cue
@@ -47,8 +47,6 @@ options: {
 	]
 	cpu:    string
 	memory: string
-	class:  string
-	classDefRef: {...}
 	replicas: int
 	storage:  string
 	vctNames: [...string]
@@ -128,9 +126,6 @@ content: {
 		if options.type == "VerticalScaling" {
 			verticalScaling: [ for _, cName in options.componentNames {
 				componentName: cName
-				if options.class != "" {
-					classDefRef: options.classDefRef
-				}
 				requests: {
 					if options.memory != "" {
 						memory: options.memory

diff --git a/pkg/cluster/charts/kafka-cluster.tgz b/pkg/cluster/charts/kafka-cluster.tgz
diff --git a/pkg/cluster/charts/llm-cluster.tgz b/pkg/cluster/charts/llm-cluster.tgz
diff --git a/pkg/cluster/charts/redis-cluster.tgz b/pkg/cluster/charts/redis-cluster.tgz
diff --git a/pkg/cmd/class/class.go b/pkg/cmd/class/class.go
diff --git a/pkg/cmd/class/class_test.go b/pkg/cmd/class/class_test.go