Update kubernetes to 1.16.0-rc.2

Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-16 20:28:35 -07:00
parent fcd6bf318b
commit 5a68bd70c8
137 changed files with 38868 additions and 16499 deletions
--- a/vendor/github.com/json-iterator/go/reflect_marshaler.go
+++ b/vendor/github.com/json-iterator/go/reflect_marshaler.go
@@ -93,8 +93,7 @@ func (encoder *marshalerEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
 		stream.WriteNil()
 		return
 	}
-	marshaler := obj.(json.Marshaler)
-	bytes, err := marshaler.MarshalJSON()
+	bytes, err := json.Marshal(obj)
 	if err != nil {
 		stream.Error = err
 	} else {