Skip to content

K
k3s
Commit 654de23c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 7deb3b29 2506af46
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
pkg/api/helper/helpers.go
View file @ 654de23c
...@@ -53,6 +53,9 @@ var Semantic = conversion.EqualitiesOrDie( ...@@ -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()
}, },
......
staging/src/k8s.io/apimachinery/pkg/api/equality/semantic.go
View file @ 654de23c
...@@ -34,6 +34,9 @@ var Semantic = conversion.EqualitiesOrDie( ...@@ -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()
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment