diff --git a/docs/user_docs/cli/kbcli_cluster_create_etcd.md b/docs/user_docs/cli/kbcli_cluster_create_etcd.md index 2ae217cab..4ea3d7e6b 100644 --- a/docs/user_docs/cli/kbcli_cluster_create_etcd.md +++ b/docs/user_docs/cli/kbcli_cluster_create_etcd.md @@ -21,6 +21,9 @@ kbcli cluster create etcd NAME [flags] ### Options ``` + --client-service.node-port int Optional, if clientService type is NodePort, by default and for convenience, the Kubernetes control plane will allocate a port from a range (default: 30000-32767). + --client-service.port int The port on which the service will listen. (default 2379) + --client-service.role string Role of the service within the cluster. (default "leader") --cpu float CPU cores. Value range [0.5, 64]. (default 0.5) --disable-exporter Enable or disable monitor. (default true) --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") @@ -29,8 +32,6 @@ kbcli cluster create etcd NAME [flags] --memory float Memory, the unit is Gi. Value range [0.5, 1000]. (default 0.5) --node-labels stringToString Node label selector (default []) -o, --output format Prints the output in the specified format. Allowed values: JSON and YAML (default yaml) - --peer-service.enabled Enable peer service (no need to enable for single cluster). - --peer-service.type string Service type for etcd peers, default peer service for single cluster use headless ClusterIP. Valid option is LoadBalancer, will support NodePort in the future. Legal values [ClusterIP, LoadBalancer]. (default "LoadBalancer") --pod-anti-affinity string Pod anti-affinity type, one of: (Preferred, Required) (default "Preferred") --replicas int The number of replicas, the default replicas is 3. Value range [1, 5]. (default 3) --storage float Data Storage size, the unit is Gi. Value range [1, 10000]. (default 10) diff --git a/docs/user_docs/cli/kbcli_cluster_create_mongodb.md b/docs/user_docs/cli/kbcli_cluster_create_mongodb.md index ebec688af..96b9b6952 100644 --- a/docs/user_docs/cli/kbcli_cluster_create_mongodb.md +++ b/docs/user_docs/cli/kbcli_cluster_create_mongodb.md @@ -39,7 +39,7 @@ kbcli cluster create mongodb NAME [flags] --termination-policy string The termination policy of cluster. Legal values [DoNotTerminate, Delete, WipeOut]. (default "Delete") --tolerations strings Tolerations for cluster, such as "key=value:effect,key:effect", for example '"engineType=mongo:NoSchedule", "diskType:NoSchedule"' --topology-keys stringArray Topology keys for affinity - --version string Cluster version. Legal values [8.0.4, 7.0.16, 7.0.12, 6.0.20, 6.0.16, 5.0.30, 5.0.28, 4.4.29, 4.2.24, 4.0.28]. (default "6.0.16") + --version string Cluster version. Legal values [8.0.8, 8.0.6, 8.0.4, 7.0.19, 7.0.16, 7.0.12, 6.0.22, 6.0.20, 6.0.16, 5.0.30, 5.0.28, 4.4.29, 4.2.24, 4.0.28]. (default "6.0.16") ``` ### Options inherited from parent commands diff --git a/docs/user_docs/cli/kbcli_cluster_create_mysql.md b/docs/user_docs/cli/kbcli_cluster_create_mysql.md index 7cd0a6ff5..9cbe561ee 100644 --- a/docs/user_docs/cli/kbcli_cluster_create_mysql.md +++ b/docs/user_docs/cli/kbcli_cluster_create_mysql.md @@ -41,7 +41,7 @@ kbcli cluster create mysql NAME [flags] --tenancy string Tenancy options, one of: (SharedNode, DedicatedNode) (default "SharedNode") --termination-policy string The termination policy of cluster. Legal values [DoNotTerminate, Delete, WipeOut]. (default "Delete") --tolerations strings Tolerations for cluster, such as "key=value:effect,key:effect", for example '"engineType=mongo:NoSchedule", "diskType:NoSchedule"' - --topology string Topology type of the serve. Note that under the orc/orc-proxysql topology, it is necessary to specify the Orchestrator cluster information. You should choose either orchestrator.cluster-service-selector or orchestrator.service-reference. This means that depending on your setup, you will configure one of these options to properly integrate with the Orchestrator service for managing your MySQL cluster. Legal values [semisync, semisync-proxysql, mgr, orc, orc-proxysql]. (default "server") + --topology string Topology type of the serve. Note that under the orc/orc-proxysql topology, it is necessary to specify the Orchestrator cluster information. You should choose either orchestrator.cluster-service-selector or orchestrator.service-reference. This means that depending on your setup, you will configure one of these options to properly integrate with the Orchestrator service for managing your MySQL cluster. Legal values [semisync, semisync-proxysql, mgr, mgr-proxysql, orc, orc-proxysql]. (default "semisync") --topology-keys stringArray Topology keys for affinity --version string MySQL version Legal values [8.0.39, 8.0.38, 8.0.37, 8.0.36, 8.4.2, 8.4.1, 8.4.0, 5.7.44]. (default "8.0.39") ``` diff --git a/docs/user_docs/cli/kbcli_cluster_create_rabbitmq.md b/docs/user_docs/cli/kbcli_cluster_create_rabbitmq.md index 70967244d..5becf0bb4 100644 --- a/docs/user_docs/cli/kbcli_cluster_create_rabbitmq.md +++ b/docs/user_docs/cli/kbcli_cluster_create_rabbitmq.md @@ -38,7 +38,7 @@ kbcli cluster create rabbitmq NAME [flags] --termination-policy string The termination policy of cluster. Legal values [DoNotTerminate, Delete, WipeOut]. (default "Delete") --tolerations strings Tolerations for cluster, such as "key=value:effect,key:effect", for example '"engineType=mongo:NoSchedule", "diskType:NoSchedule"' --topology-keys stringArray Topology keys for affinity - --version string Cluster version. Legal values [3.13.7, 3.13.2, 3.12.14, 3.11.28, 3.10.25, 3.9.29, 3.8.14]. (default "3.13.7") + --version string Cluster version. Legal values [4.0.9, 3.13.7, 3.13.2, 3.12.14, 3.11.28, 3.10.25, 3.9.29, 3.8.14]. (default "3.13.7") ``` ### Options inherited from parent commands diff --git a/pkg/cluster/charts/etcd.tgz b/pkg/cluster/charts/etcd.tgz index 332991ba7..3c46c4aee 100644 Binary files a/pkg/cluster/charts/etcd.tgz and b/pkg/cluster/charts/etcd.tgz differ diff --git a/pkg/cluster/charts/kafka.tgz b/pkg/cluster/charts/kafka.tgz index 18aa2ba7e..469a1e923 100644 Binary files a/pkg/cluster/charts/kafka.tgz and b/pkg/cluster/charts/kafka.tgz differ diff --git a/pkg/cluster/charts/mongodb.tgz b/pkg/cluster/charts/mongodb.tgz index 24152158f..9dac5aebe 100644 Binary files a/pkg/cluster/charts/mongodb.tgz and b/pkg/cluster/charts/mongodb.tgz differ diff --git a/pkg/cluster/charts/mysql.tgz b/pkg/cluster/charts/mysql.tgz index 417c0d1e0..197899b07 100644 Binary files a/pkg/cluster/charts/mysql.tgz and b/pkg/cluster/charts/mysql.tgz differ diff --git a/pkg/cluster/charts/postgresql.tgz b/pkg/cluster/charts/postgresql.tgz index 6c965cd3d..4d0d59a00 100644 Binary files a/pkg/cluster/charts/postgresql.tgz and b/pkg/cluster/charts/postgresql.tgz differ diff --git a/pkg/cluster/charts/qdrant.tgz b/pkg/cluster/charts/qdrant.tgz index 50ae64a2b..e57b39d4a 100644 Binary files a/pkg/cluster/charts/qdrant.tgz and b/pkg/cluster/charts/qdrant.tgz differ diff --git a/pkg/cluster/charts/rabbitmq.tgz b/pkg/cluster/charts/rabbitmq.tgz index b74b7a491..56af28fc7 100644 Binary files a/pkg/cluster/charts/rabbitmq.tgz and b/pkg/cluster/charts/rabbitmq.tgz differ diff --git a/pkg/cluster/charts/redis.tgz b/pkg/cluster/charts/redis.tgz index d1b07f5f8..b8c8ec162 100644 Binary files a/pkg/cluster/charts/redis.tgz and b/pkg/cluster/charts/redis.tgz differ diff --git a/pkg/cmd/cluster/delete.go b/pkg/cmd/cluster/delete.go index 044152950..0ddb7d0dc 100644 --- a/pkg/cmd/cluster/delete.go +++ b/pkg/cmd/cluster/delete.go @@ -92,7 +92,7 @@ func clusterPreDeleteHook(o *action.DeleteOptions, object runtime.Object) error } if o.Force { - fmt.Fprintf(o.Out, printer.BoldRed("WARNING: Using --force may lead to potential data loss or residual dirty data if the cluster depends on other clusters.\n")) + fmt.Fprint(o.Out, printer.BoldRed("WARNING: Using --force may lead to potential data loss or residual dirty data if the cluster depends on other clusters.\n")) components := util.GetComponentsOrShards(cluster) for _, componentName := range components { dynamicClient, err := o.Factory.DynamicClient() diff --git a/pkg/util/flags/flags.go b/pkg/util/flags/flags.go index 988db1523..0b878d1b8 100644 --- a/pkg/util/flags/flags.go +++ b/pkg/util/flags/flags.go @@ -50,6 +50,7 @@ const ( ) const ( + typeNull = "null" typeString = "string" typeNumber = "number" typeInteger = "integer" @@ -135,6 +136,8 @@ func buildOneFlag(cmd *cobra.Command, k string, s *spec.Schema, isArray bool) er } case typeArray: return fmt.Errorf("unsupported build flags for object with array nested within an array") + case typeNull: + return nil default: return fmt.Errorf("unsupported json schema type %s", s.Type) } @@ -160,6 +163,8 @@ func buildOneFlag(cmd *cobra.Command, k string, s *spec.Schema, isArray bool) er if err := buildOneFlag(cmd, name, s.Items.Schema, true); err != nil { return err } + case typeNull: + return nil default: return fmt.Errorf("unsupported json schema type %s", s.Type) }