github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106797 from kidlj/fix_mapToUnstructured_todo

Browse Source 
resolve TODO in mapToUnstructured and sliceToUnstructured
This commit is contained in:
Kubernetes Prow Robot 2021-12-08 05:35:46 -08:00 committed by GitHub
commit 9968b0eff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
staging/src/k8s.io/apimachinery/pkg/runtime/converter.go
View File

@ -705,21 +705,10 @@ func mapToUnstructured(sv, dv reflect.Value) error {
} }
if dt.Kind() == reflect.Interface && dv.NumMethod() == 0 { if dt.Kind() == reflect.Interface && dv.NumMethod() == 0 {
if st.Key().Kind() == reflect.String { if st.Key().Kind() == reflect.String {
switch st.Elem().Kind() { dv.Set(reflect.MakeMap(mapStringInterfaceType))
// TODO It should be possible to reuse the slice for primitive types. dv = dv.Elem()
// However, it is panicing in the following form. dt = dv.Type()
// case reflect.String, reflect.Bool,
// reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
// reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
// sv.Set(sv)
// return nil
default:
// We need to do a proper conversion.
}
} }
dv.Set(reflect.MakeMap(mapStringInterfaceType))
dv = dv.Elem()
dt = dv.Type()
} }
if dt.Kind() != reflect.Map { if dt.Kind() != reflect.Map {
return fmt.Errorf("cannot convert map to: %v", dt.Kind()) return fmt.Errorf("cannot convert map to: %v", dt.Kind())
@ -763,20 +752,9 @@ func sliceToUnstructured(sv, dv reflect.Value) error {
return nil return nil
} }
if dt.Kind() == reflect.Interface && dv.NumMethod() == 0 { if dt.Kind() == reflect.Interface && dv.NumMethod() == 0 {
switch st.Elem().Kind() { dv.Set(reflect.MakeSlice(reflect.SliceOf(dt), sv.Len(), sv.Cap()))
// TODO It should be possible to reuse the slice for primitive types. dv = dv.Elem()
// However, it is panicing in the following form. dt = dv.Type()
// case reflect.String, reflect.Bool,
// reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
// reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
// sv.Set(sv)
// return nil
default:
// We need to do a proper conversion.
dv.Set(reflect.MakeSlice(reflect.SliceOf(dt), sv.Len(), sv.Cap()))
dv = dv.Elem()
dt = dv.Type()
}
} }
if dt.Kind() != reflect.Slice { if dt.Kind() != reflect.Slice {
return fmt.Errorf("cannot convert slice to: %v", dt.Kind()) return fmt.Errorf("cannot convert slice to: %v", dt.Kind())