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

Rename DropDisabledFields

Browse Source
This commit is contained in:
Jordan Liggitt
2018-12-17 12:08:25 -05:00
parent f77a0706d0
commit 49028df5f9
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/registry/core/replicationcontroller/strategy.go
View File

@@ -81,7 +81,7 @@ func (rcStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
controller.Generation = 1
if controller.Spec.Template != nil {
pod.DropDisabledAlphaFields(&controller.Spec.Template.Spec)
pod.DropDisabledFields(&controller.Spec.Template.Spec)
}
}
@@ -93,10 +93,10 @@ func (rcStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object)
newController.Status = oldController.Status
if oldController.Spec.Template != nil {
pod.DropDisabledAlphaFields(&oldController.Spec.Template.Spec)
pod.DropDisabledFields(&oldController.Spec.Template.Spec)
}
if newController.Spec.Template != nil {
pod.DropDisabledAlphaFields(&newController.Spec.Template.Spec)
pod.DropDisabledFields(&newController.Spec.Template.Spec)
}
// Any changes to the spec increment the generation number, any changes to the