From 229894c730c70d39992b27fe3ef98968b2a3fbff Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Mon, 8 Jul 2019 16:32:03 -0700 Subject: [PATCH] Make changes to integrate new version --- .../endpoints/handlers/fieldmanager/fieldmanager.go | 4 ++-- .../handlers/fieldmanager/internal/managedfields.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go index 2360ff41e1e..d6d21d450d1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go @@ -267,11 +267,11 @@ func (f *FieldManager) stripFields(managed fieldpath.ManagedFields, manager stri if vs == nil { panic(fmt.Sprintf("Found unexpected nil manager which should never happen: %s", manager)) } - newSet := vs.Set.Difference(stripSet) + newSet := vs.Set().Difference(stripSet) if newSet.Empty() { delete(managed, manager) } else { - managed[manager] = &fieldpath.VersionedSet{Set: newSet, APIVersion: vs.APIVersion, Applied: vs.Applied} + managed[manager] = fieldpath.NewVersionedSet(newSet, vs.APIVersion(), vs.Applied()) } } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go index 7f7685c420b..4b4391e0c52 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go @@ -112,7 +112,7 @@ func BuildManagerIdentifier(encodedManager *metav1.ManagedFieldsEntry) (manager return string(b), nil } -func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (versionedSet *fieldpath.VersionedSet, err error) { +func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (versionedSet fieldpath.VersionedSet, err error) { fields := metav1.Fields{} if encodedVersionedSet.Fields != nil { fields = *encodedVersionedSet.Fields @@ -121,7 +121,7 @@ func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (version if err != nil { return nil, fmt.Errorf("error decoding set: %v", err) } - return &fieldpath.VersionedSet{Set: &set, APIVersion: fieldpath.APIVersion(encodedVersionedSet.APIVersion), Applied: encodedVersionedSet.Operation == metav1.ManagedFieldsOperationApply}, nil + return fieldpath.NewVersionedSet(&set, fieldpath.APIVersion(encodedVersionedSet.APIVersion), encodedVersionedSet.Operation == metav1.ManagedFieldsOperationApply), nil } // encodeManagedFields converts ManagedFields from the format used by @@ -171,7 +171,7 @@ func sortEncodedManagedFields(encodedManagedFields []metav1.ManagedFieldsEntry) return encodedManagedFields, nil } -func encodeManagerVersionedSet(manager string, versionedSet *fieldpath.VersionedSet) (encodedVersionedSet *metav1.ManagedFieldsEntry, err error) { +func encodeManagerVersionedSet(manager string, versionedSet fieldpath.VersionedSet) (encodedVersionedSet *metav1.ManagedFieldsEntry, err error) { encodedVersionedSet = &metav1.ManagedFieldsEntry{} // Get as many fields as we can from the manager identifier @@ -181,11 +181,11 @@ func encodeManagerVersionedSet(manager string, versionedSet *fieldpath.Versioned } // Get the APIVersion, Operation, and Fields from the VersionedSet - encodedVersionedSet.APIVersion = string(versionedSet.APIVersion) - if versionedSet.Applied { + encodedVersionedSet.APIVersion = string(versionedSet.APIVersion()) + if versionedSet.Applied() { encodedVersionedSet.Operation = metav1.ManagedFieldsOperationApply } - fields, err := SetToFields(*versionedSet.Set) + fields, err := SetToFields(*versionedSet.Set()) if err != nil { return nil, fmt.Errorf("error encoding set: %v", err) }