Update dependencies to K8s 1.8
This commit is contained in:
parent
ba6c89672d
commit
6a59f4c9a2
1114 changed files with 160955 additions and 262845 deletions
2
vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
generated
vendored
2
vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
generated
vendored
|
|
@ -1138,7 +1138,7 @@ func mergePatchIntoOriginal(original, patch map[string]interface{}, t reflect.Ty
|
|||
return err
|
||||
}
|
||||
case !foundOriginal && !foundPatch:
|
||||
return nil
|
||||
continue
|
||||
}
|
||||
|
||||
// Split all items into patch items and server-only items and then enforce the order.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue