Skip to content

Commit b831df7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#128416 from jpbetz/reset-filter
Add optional ResetFieldsFilterStrategy interface for storage
2 parents 223ac36 + 2bc17d1 commit b831df7

File tree

70 files changed

+479
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+479
-195
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ require (
119119
k8s.io/system-validators v1.8.0
120120
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
121121
sigs.k8s.io/knftables v0.0.17
122-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
122+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
123123
sigs.k8s.io/yaml v1.4.0
124124
)
125125

‎go.sum‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@ gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI
687687
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
688688
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
689689
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
690-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
691690
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
692691
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
693692
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -719,7 +718,7 @@ sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 h1:o1mtt6vpxsxDYaZKrw3BnEtc+pAjLz7Uffn
719718
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0/go.mod h1:AeFCmgCrXzmvjWWaeZCyBp6XzG1Y0w1svYus8GhJEOE=
720719
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
721720
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
722-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
723-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
721+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
722+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
724723
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
725724
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎staging/src/k8s.io/api/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ require (
3030
google.golang.org/protobuf v1.34.2 // indirect
3131
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
3232
gopkg.in/inf.v0 v0.9.1 // indirect
33-
gopkg.in/yaml.v2 v2.4.0 // indirect
3433
k8s.io/klog/v2 v2.130.1 // indirect
3534
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
3635
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
37-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
36+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
3837
sigs.k8s.io/yaml v1.4.0 // indirect
3938
)
4039

‎staging/src/k8s.io/api/go.sum‎

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
3636
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3737
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
38-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
38+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
3939
sigs.k8s.io/yaml v1.4.0
4040
)
4141

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ func scopeWithFieldManager(typeConverter managedfields.TypeConverter, reqScope h
10721072
reqScope.Kind,
10731073
reqScope.HubGroupVersion,
10741074
subresource,
1075-
resetFields,
1075+
fieldpath.NewExcludeFilterSetMap(resetFields),
10761076
)
10771077
if err != nil {
10781078
return handlers.RequestScope{}, err

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
3030
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3131
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
32-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
32+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

‎staging/src/k8s.io/apimachinery/go.sum‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apimachinery/pkg/util/managedfields/fieldmanager.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ package managedfields
1919
import (
2020
"fmt"
2121

22+
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
23+
2224
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2325
"k8s.io/apimachinery/pkg/runtime"
2426
"k8s.io/apimachinery/pkg/runtime/schema"
2527
"k8s.io/apimachinery/pkg/util/managedfields/internal"
26-
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
2728
)
2829

2930
// FieldManager updates the managed fields and merges applied
@@ -32,7 +33,7 @@ type FieldManager = internal.FieldManager
3233

3334
// NewDefaultFieldManager creates a new FieldManager that merges apply requests
3435
// and update managed fields for other types of requests.
35-
func NewDefaultFieldManager(typeConverter TypeConverter, objectConverter runtime.ObjectConvertor, objectDefaulter runtime.ObjectDefaulter, objectCreater runtime.ObjectCreater, kind schema.GroupVersionKind, hub schema.GroupVersion, subresource string, resetFields map[fieldpath.APIVersion]*fieldpath.Set) (*FieldManager, error) {
36+
func NewDefaultFieldManager(typeConverter TypeConverter, objectConverter runtime.ObjectConvertor, objectDefaulter runtime.ObjectDefaulter, objectCreater runtime.ObjectCreater, kind schema.GroupVersionKind, hub schema.GroupVersion, subresource string, resetFields map[fieldpath.APIVersion]fieldpath.Filter) (*FieldManager, error) {
3637
f, err := internal.NewStructuredMergeManager(typeConverter, objectConverter, objectDefaulter, kind.GroupVersion(), hub, resetFields)
3738
if err != nil {
3839
return nil, fmt.Errorf("failed to create field manager: %v", err)
@@ -43,7 +44,7 @@ func NewDefaultFieldManager(typeConverter TypeConverter, objectConverter runtime
4344
// NewDefaultCRDFieldManager creates a new FieldManager specifically for
4445
// CRDs. This allows for the possibility of fields which are not defined
4546
// in models, as well as having no models defined at all.
46-
func NewDefaultCRDFieldManager(typeConverter TypeConverter, objectConverter runtime.ObjectConvertor, objectDefaulter runtime.ObjectDefaulter, objectCreater runtime.ObjectCreater, kind schema.GroupVersionKind, hub schema.GroupVersion, subresource string, resetFields map[fieldpath.APIVersion]*fieldpath.Set) (_ *FieldManager, err error) {
47+
func NewDefaultCRDFieldManager(typeConverter TypeConverter, objectConverter runtime.ObjectConvertor, objectDefaulter runtime.ObjectDefaulter, objectCreater runtime.ObjectCreater, kind schema.GroupVersionKind, hub schema.GroupVersion, subresource string, resetFields map[fieldpath.APIVersion]fieldpath.Filter) (_ *FieldManager, err error) {
4748
f, err := internal.NewCRDStructuredMergeManager(typeConverter, objectConverter, objectDefaulter, kind.GroupVersion(), hub, resetFields)
4849
if err != nil {
4950
return nil, fmt.Errorf("failed to create field manager: %v", err)

0 commit comments

Comments
 (0)