github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 23:57:49 +00:00
Code Issues Projects Releases Wiki Activity

Apply feedback

Browse Source
This commit is contained in:
Joe Betz 2024-06-03 14:59:31 -04:00
parent c942ab6900
commit 13f809478f
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/equality.go
View File

@ -86,7 +86,8 @@ func equalIgnoringValueAtPath(a, b any, path []string) bool {
aMap, aOk := a.(map[string]any) aMap, aOk := a.(map[string]any)
bMap, bOk := b.(map[string]any) bMap, bOk := b.(map[string]any)
if !aOk || !bOk { if !aOk || !bOk {
return !avoidTimestampEqualities.DeepEqual(a, b) // Can't traverse into non-maps, ignore
return true
} }
if len(aMap) != len(bMap) { if len(aMap) != len(bMap) {
return false return false

31
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/equality_test.go
View File

@ -1,5 +1,5 @@
/* /*
Copyright 20214The Kubernetes Authors. Copyright 2024 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -91,7 +91,7 @@ func TestEqualIgnoringFieldValueAtPath(t *testing.T) {
want: false, want: false,
}, },
{ {
name: "extra spec fields in object a", name: "extra spec field",
a: map[string]any{ a: map[string]any{
"metadata": map[string]any{ "metadata": map[string]any{
"labels": map[string]any{"env": "dev"}, "labels": map[string]any{"env": "dev"},
@ -114,7 +114,7 @@ func TestEqualIgnoringFieldValueAtPath(t *testing.T) {
want: false, want: false,
}, },
{ {
name: "different spec field in object b", name: "different spec field",
a: map[string]any{ a: map[string]any{
"metadata": map[string]any{ "metadata": map[string]any{
"labels": map[string]any{"env": "dev"}, "labels": map[string]any{"env": "dev"},
@ -158,6 +158,26 @@ func TestEqualIgnoringFieldValueAtPath(t *testing.T) {
}, },
want: true, want: true,
}, },
{
name: "wrong type for metadata result in differences being ignored",
a: map[string]any{
"metadata": []any{
"something",
},
"spec": map[string]any{
"field": "value",
},
},
b: map[string]any{
"metadata": []any{
"something else",
},
"spec": map[string]any{
"field": "value",
},
},
want: true,
},
} }
path := []string{"metadata", "managedFields"} path := []string{"metadata", "managedFields"}
@ -168,6 +188,11 @@ func TestEqualIgnoringFieldValueAtPath(t *testing.T) {
if actual != c.want { if actual != c.want {
t.Error("Expected equality check to return ", c.want, ", but got ", actual) t.Error("Expected equality check to return ", c.want, ", but got ", actual)
} }
// Check that equality is commutative
actual = equalIgnoringValueAtPath(c.b, c.a, path)
if actual != c.want {
t.Error("Expected equality check to return ", c.want, ", but got ", actual)
}
}) })
} }
} }

1
test/integration/apiserver/apply/apply_crd_test.go
View File

@ -737,6 +737,7 @@ spec:
} }
func TestNoOpApplyWithDefaultsSameResourceVersionCRD(t *testing.T) { func TestNoOpApplyWithDefaultsSameResourceVersionCRD(t *testing.T) {
// https://github.com/kubernetes/kubernetes/issues/124605
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd()) server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)