From 2506af46bcfa668138693ab3fe0574581ffb4fed Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 4 Aug 2017 14:02:53 +0200 Subject: [PATCH] Add MicroTime to DeepEquals overrides --- pkg/api/helper/helpers.go | 3 +++ staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/api/helper/helpers.go b/pkg/api/helper/helpers.go index 962b8aafb5..fc0f70a876 100644 --- 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() }, diff --git a/staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go b/staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go index 3ebd8c719d..f02fa8e434 100644 --- 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() },