Merge pull request #50143 from gmarek/microtime

Automatic merge from submit-queue (batch tested with PRs 49868, 50143, 49377, 50141, 50145) Add metav1.MicroTime to exceptions in tag tests

Merge pull request #50143 from gmarek/microtime
293ab0f8 · Kubernetes Submit Queue · GitHub · fb661268 · 300fd264 · 293ab0f8
Commit 293ab0f8 authored Aug 07, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

import_known_versions_test.go pkg/master/import_known_versions_test.go +1 -0

No files found.
--- a/pkg/master/import_known_versions_test.go
+++ b/pkg/master/import_known_versions_test.go
@@ -73,6 +73,7 @@ func TestTypeTags(t *testing.T) {
 var typesAllowedTags = map[reflect.Type]bool{
 	reflect.TypeOf(intstr.IntOrString{}):          true,
 	reflect.TypeOf(metav1.Time{}):                 true,
+	reflect.TypeOf(metav1.MicroTime{}):            true,
 	reflect.TypeOf(metav1.Duration{}):             true,
 	reflect.TypeOf(metav1.TypeMeta{}):             true,
 	reflect.TypeOf(metav1.ListMeta{}):             true,