github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not reset managedFields in status update strategy

Browse Source
This commit is contained in:
Antoine Pelisse
2020-03-18 14:17:32 -07:00
parent 94cb60e0e8
commit dfe1703ffa
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/flowcontrol/flowschema/strategy.go
View File

@@ -94,7 +94,12 @@ var StatusStrategy = flowSchemaStatusStrategy{Strategy}
func (flowSchemaStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {
newFlowSchema := obj.(*flowcontrol.FlowSchema)
oldFlowSchema := old.(*flowcontrol.FlowSchema)
// managedFields must be preserved since it's been modified to
// track changed fields in the status update.
managedFields := newFlowSchema.ManagedFields
newFlowSchema.ObjectMeta = oldFlowSchema.ObjectMeta
newFlowSchema.ManagedFields = managedFields
newFlowSchema.Spec = oldFlowSchema.Spec
}

5
pkg/registry/flowcontrol/prioritylevelconfiguration/strategy.go
View File

@@ -94,7 +94,12 @@ var StatusStrategy = priorityLevelConfigurationStatusStrategy{Strategy}
func (priorityLevelConfigurationStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {
newPriorityLevelConfiguration := obj.(*flowcontrol.PriorityLevelConfiguration)
oldPriorityLevelConfiguration := old.(*flowcontrol.PriorityLevelConfiguration)
// managedFields must be preserved since it's been modified to
// track changed fields in the status update.
managedFields := newPriorityLevelConfiguration.ManagedFields
newPriorityLevelConfiguration.ObjectMeta = oldPriorityLevelConfiguration.ObjectMeta
newPriorityLevelConfiguration.ManagedFields = managedFields
newPriorityLevelConfiguration.Spec = oldPriorityLevelConfiguration.Spec
}