github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70827 from apelisse/unstructured-meta-accessor

Browse Source 
[FEATURE-SERVERSIDE-APPLY] Fix unstructured meta accessor for ManagedFields
This commit is contained in:
k8s-ci-robot
2018-11-08 16:14:36 -08:00
committed by GitHub
parent 4364cec72f c9422c80a7
commit 38ab32898e
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured.go
View File

@@ -452,13 +452,16 @@ func (u *Unstructured) SetClusterName(clusterName string) {
}
func (u *Unstructured) GetManagedFields() map[string]metav1.VersionedFieldSet {
unstructuredManagedFields, _, _ := NestedMap(u.Object, "metadata", "managedFields")
if unstructuredManagedFields == nil {
m, found, err := nestedMapNoCopy(u.Object, "metadata", "managedFields")
if !found || err != nil {
return nil
}
managedFields := make(map[string]metav1.VersionedFieldSet, len(unstructuredManagedFields))
// TODO: convert from unstructured
return managedFields
out := &map[string]metav1.VersionedFieldSet{}
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(m, out); err != nil {
utilruntime.HandleError(fmt.Errorf("unable to retrieve managedFields for object: %v", err))
return nil
}
return *out
}
func (u *Unstructured) SetManagedFields(managedFields map[string]metav1.VersionedFieldSet) {
@@ -466,7 +469,9 @@ func (u *Unstructured) SetManagedFields(managedFields map[string]metav1.Versione
RemoveNestedField(u.Object, "metadata", "managedFields")
return
}
unstructuredManagedFields := make(map[string]string, len(managedFields))
// TODO: convert to unstructured
u.setNestedMap(unstructuredManagedFields, "metadata", "managedFields")
out, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&managedFields)
if err != nil {
utilruntime.HandleError(fmt.Errorf("unable to retrieve managedFields for object: %v", err))
}
u.setNestedField(out, "metadata", "managedFields")
}