From 940814fca240db06db4fe25d4a7455001b4cfa97 Mon Sep 17 00:00:00 2001 From: loomt Date: Wed, 4 Jun 2025 11:26:33 +0800 Subject: [PATCH 1/2] fix null type of values schema --- pkg/util/flags/flags.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/util/flags/flags.go b/pkg/util/flags/flags.go index 65f0b4c22..307d5c488 100644 --- a/pkg/util/flags/flags.go +++ b/pkg/util/flags/flags.go @@ -46,6 +46,7 @@ const ( ) const ( + typeNull = "null" typeString = "string" typeNumber = "number" typeInteger = "integer" @@ -123,6 +124,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) } @@ -148,6 +151,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) } From 28320837f929b5165c2a1c9b7adbad5227254bc9 Mon Sep 17 00:00:00 2001 From: loomt Date: Wed, 4 Jun 2025 12:33:22 +0800 Subject: [PATCH 2/2] fix test --- pkg/cmd/kubeblocks/kubeblocks_objects_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/kubeblocks/kubeblocks_objects_test.go b/pkg/cmd/kubeblocks/kubeblocks_objects_test.go index 41458ed55..27971da69 100644 --- a/pkg/cmd/kubeblocks/kubeblocks_objects_test.go +++ b/pkg/cmd/kubeblocks/kubeblocks_objects_test.go @@ -196,7 +196,8 @@ func mockCRD() []runtime.Object { APIVersion: "apiextensions.k8s.io/v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "clusterversions.apps.kubeblocks.io", + Name: "clusterversions.apps.kubeblocks.io", + Labels: label, }, Spec: v1.CustomResourceDefinitionSpec{ Group: types.AppsAPIGroup,