Merge pull request #50145 from gmarek/micro-equality

Automatic merge from submit-queue (batch tested with PRs 49868, 50143, 49377, 50141, 50145) Add MicroTime to DeepEquals overrides

Merge pull request #50145 from gmarek/micro-equality
654de23c · Kubernetes Submit Queue · GitHub · 7deb3b29 · 2506af46 · 654de23c
Commit 654de23c authored Aug 07, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

helpers.go pkg/api/helper/helpers.go +3 -0

semantic.go staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go +3 -0

No files found.
--- a/pkg/api/helper/helpers.go
+++ b/pkg/api/helper/helpers.go
@@ -53,6 +53,9 @@ var Semantic = conversion.EqualitiesOrDie(
 		// Uninitialized quantities are equivalent to 0 quantities.
 		return a.Cmp(b) == 0
 	},
+	func(a, b metav1.MicroTime) bool {
+		return a.UTC() == b.UTC()
+	},
 	func(a, b metav1.Time) bool {
 		return a.UTC() == b.UTC()
 	},

--- a/staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go
@@ -34,6 +34,9 @@ var Semantic = conversion.EqualitiesOrDie(
 		// Uninitialized quantities are equivalent to 0 quantities.
 		return a.Cmp(b) == 0
 	},
+	func(a, b metav1.MicroTime) bool {
+		return a.UTC() == b.UTC()
+	},
 	func(a, b metav1.Time) bool {
 		return a.UTC() == b.UTC()
 	},