github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Make changes to integrate new version

Browse Source
This commit is contained in:
jennybuckley 2019-07-08 16:32:03 -07:00 committed by Jennifer Buckley
parent 0bf24b557e
commit 229894c730
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,11 +267,11 @@ func (f *FieldManager) stripFields(managed fieldpath.ManagedFields, manager stri
if vs == nil { if vs == nil {
panic(fmt.Sprintf("Found unexpected nil manager which should never happen: %s", manager)) 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() { if newSet.Empty() {
delete(managed, manager) delete(managed, manager)
} else { } else {
managed[manager] = &fieldpath.VersionedSet{Set: newSet, APIVersion: vs.APIVersion, Applied: vs.Applied} managed[manager] = fieldpath.NewVersionedSet(newSet, vs.APIVersion(), vs.Applied())
} }
} }

12
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go
View File

@ -112,7 +112,7 @@ func BuildManagerIdentifier(encodedManager *metav1.ManagedFieldsEntry) (manager
return string(b), nil 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{} fields := metav1.Fields{}
if encodedVersionedSet.Fields != nil { if encodedVersionedSet.Fields != nil {
fields = *encodedVersionedSet.Fields fields = *encodedVersionedSet.Fields
@ -121,7 +121,7 @@ func decodeVersionedSet(encodedVersionedSet *metav1.ManagedFieldsEntry) (version
if err != nil { if err != nil {
return nil, fmt.Errorf("error decoding set: %v", err) 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 // encodeManagedFields converts ManagedFields from the format used by
@ -171,7 +171,7 @@ func sortEncodedManagedFields(encodedManagedFields []metav1.ManagedFieldsEntry)
return encodedManagedFields, nil 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{} encodedVersionedSet = &metav1.ManagedFieldsEntry{}
// Get as many fields as we can from the manager identifier // 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 // Get the APIVersion, Operation, and Fields from the VersionedSet
encodedVersionedSet.APIVersion = string(versionedSet.APIVersion) encodedVersionedSet.APIVersion = string(versionedSet.APIVersion())
if versionedSet.Applied { if versionedSet.Applied() {
encodedVersionedSet.Operation = metav1.ManagedFieldsOperationApply encodedVersionedSet.Operation = metav1.ManagedFieldsOperationApply
} }
fields, err := SetToFields(*versionedSet.Set) fields, err := SetToFields(*versionedSet.Set())
if err != nil { if err != nil {
return nil, fmt.Errorf("error encoding set: %v", err) return nil, fmt.Errorf("error encoding set: %v", err)
} }