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

Merge pull request #28471 from smarterclayton/reflect_diff

Browse Source 
Automatic merge from submit-queue

Handle more cases in diff.ObjectReflectDiff

Interfaces and nested map values were not being recursed.

@karkagis since @wojtek-t is out
This commit is contained in:
k8s-merge-robot 2016-07-05 00:26:08 -07:00 committed by GitHub
commit 35a345269e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/diff/diff.go
View File

@ -145,7 +145,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
} }
} }
return changes return changes
case reflect.Ptr: case reflect.Ptr, reflect.Interface:
if a.IsNil() || b.IsNil() { if a.IsNil() || b.IsNil() {
switch { switch {
case a.IsNil() && b.IsNil(): case a.IsNil() && b.IsNil():
@ -199,7 +199,7 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
if reflect.DeepEqual(a.MapIndex(key).Interface(), b.MapIndex(key).Interface()) { if reflect.DeepEqual(a.MapIndex(key).Interface(), b.MapIndex(key).Interface()) {
continue continue
} }
missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: a.MapIndex(key).Interface(), b: b.MapIndex(key).Interface()}) missing = append(missing, objectReflectDiff(path.Key(fmt.Sprintf("%s", key.Interface())), a.MapIndex(key), b.MapIndex(key))...)
continue continue
} }
missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: nil, b: b.MapIndex(key).Interface()}) missing = append(missing, diff{path: path.Key(fmt.Sprintf("%s", key.Interface())), a: nil, b: b.MapIndex(key).Interface()})