Skip to content

Commit 373310b

Browse files
committed
fix etcd null param
1 parent 7f75213 commit 373310b

10 files changed

Lines changed: 8 additions & 3 deletions

File tree

addons

Submodule addons updated 151 files

pkg/cluster/charts/etcd.tgz

-342 Bytes
Binary file not shown.

pkg/cluster/charts/kafka.tgz

4 Bytes
Binary file not shown.

pkg/cluster/charts/mongodb.tgz

5 Bytes
Binary file not shown.

pkg/cluster/charts/postgresql.tgz

-1 Bytes
Binary file not shown.

pkg/cluster/charts/qdrant.tgz

1 Byte
Binary file not shown.

pkg/cluster/charts/rabbitmq.tgz

3 Bytes
Binary file not shown.

pkg/cmd/addon/purge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ import (
3434
cmdutil "k8s.io/kubectl/pkg/cmd/util"
3535
"k8s.io/kubectl/pkg/util/templates"
3636

37-
"github.com/apecloud/kbcli/pkg/util/prompt"
3837
kbv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
3938
"github.com/apecloud/kubeblocks/apis/extensions/v1alpha1"
4039

4140
"github.com/apecloud/kbcli/pkg/types"
4241
"github.com/apecloud/kbcli/pkg/util"
42+
"github.com/apecloud/kbcli/pkg/util/prompt"
4343
)
4444

4545
const (

pkg/cmd/cluster/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func clusterPreDeleteHook(o *action.DeleteOptions, object runtime.Object) error
9292
}
9393

9494
if o.Force {
95-
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"))
95+
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"))
9696
components := util.GetComponentsOrShards(cluster)
9797
for _, componentName := range components {
9898
dynamicClient, err := o.Factory.DynamicClient()

pkg/util/flags/flags.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ const (
5050
)
5151

5252
const (
53+
typeNull = "null"
5354
typeString = "string"
5455
typeNumber = "number"
5556
typeInteger = "integer"
@@ -135,6 +136,8 @@ func buildOneFlag(cmd *cobra.Command, k string, s *spec.Schema, isArray bool) er
135136
}
136137
case typeArray:
137138
return fmt.Errorf("unsupported build flags for object with array nested within an array")
139+
case typeNull:
140+
return nil
138141
default:
139142
return fmt.Errorf("unsupported json schema type %s", s.Type)
140143
}
@@ -160,6 +163,8 @@ func buildOneFlag(cmd *cobra.Command, k string, s *spec.Schema, isArray bool) er
160163
if err := buildOneFlag(cmd, name, s.Items.Schema, true); err != nil {
161164
return err
162165
}
166+
case typeNull:
167+
return nil
163168
default:
164169
return fmt.Errorf("unsupported json schema type %s", s.Type)
165170
}

0 commit comments

Comments
 (0)