github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/6/head
Kubernetes Submit Queue 2017-08-07 04:05:02 -07:00 committed by GitHub
parent 7deb3b29cd 2506af46bc
commit 654de23cbf
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/helper/helpers.go
View File

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

3
staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go
View File

@ -34,6 +34,9 @@ var Semantic = conversion.EqualitiesOrDie(
// Uninitialized quantities are equivalent to 0 quantities. // Uninitialized quantities are equivalent to 0 quantities.
return a.Cmp(b) == 0 return a.Cmp(b) == 0
}, },
func(a, b metav1.MicroTime) bool {
return a.UTC() == b.UTC()
},
func(a, b metav1.Time) bool { func(a, b metav1.Time) bool {
return a.UTC() == b.UTC() return a.UTC() == b.UTC()
}, },