Merge remote-tracking branch 'origin/feature/component-definition' in…

…to feature/component-definition
apecloud · Oct 23, 2023 · 1a2cb10 · 1a2cb10
2 parents ec35050 + 644d0bd
commit 1a2cb10
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/dataprotection/v1alpha1/zz_generated.deepcopy.go b/apis/dataprotection/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/extensions/v1alpha1/zz_generated.deepcopy.go b/apis/extensions/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/storage/v1alpha1/zz_generated.deepcopy.go b/apis/storage/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/workloads/v1alpha1/zz_generated.deepcopy.go b/apis/workloads/v1alpha1/zz_generated.deepcopy.go
diff --git a/externalapis/preflight/v1beta2/zz_generated.deepcopy.go b/externalapis/preflight/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/controller/component/convertor.go b/pkg/controller/component/convertor.go
@@ -124,12 +124,12 @@ func covertObject(convertors map[string]convertor, obj any, args ...any) error {
 func typeofObject(obj any) reflect.Type {
 	val := reflect.ValueOf(obj)
 	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
+		return reflect.TypeOf(obj).Elem()
 	}
 	if val.Kind() != reflect.Struct {
 		panic("not a struct")
 	}
-	return reflect.TypeOf(val)
+	return reflect.TypeOf(obj)
 }
 
 type convertor interface {