github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-22 06:59:03 +00:00
Code Issues Projects Releases Wiki Activity

Pass new and old object to DropDisabledFields

Browse Source
This commit is contained in:
Jordan Liggitt
2018-12-18 17:50:22 -05:00
parent 88284f637b
commit 901ddba812
9 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/core/persistentvolumeclaim/strategy.go
View File

@@ -52,7 +52,7 @@ func (persistentvolumeclaimStrategy) PrepareForCreate(ctx context.Context, obj r
pvc := obj.(*api.PersistentVolumeClaim)
pvc.Status = api.PersistentVolumeClaimStatus{}
pvcutil.DropDisabledFields(&pvc.Spec)
pvcutil.DropDisabledFields(&pvc.Spec, nil)
}
func (persistentvolumeclaimStrategy) Validate(ctx context.Context, obj runtime.Object) field.ErrorList {
@@ -74,8 +74,7 @@ func (persistentvolumeclaimStrategy) PrepareForUpdate(ctx context.Context, obj,
oldPvc := old.(*api.PersistentVolumeClaim)
newPvc.Status = oldPvc.Status
pvcutil.DropDisabledFields(&newPvc.Spec)
pvcutil.DropDisabledFields(&oldPvc.Spec)
pvcutil.DropDisabledFields(&newPvc.Spec, &oldPvc.Spec)
}
func (persistentvolumeclaimStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {

5
pkg/registry/policy/podsecuritypolicy/strategy.go
View File

@@ -58,15 +58,14 @@ func (strategy) AllowUnconditionalUpdate() bool {
func (strategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
psp := obj.(*policy.PodSecurityPolicy)
psputil.DropDisabledFields(&psp.Spec)
psputil.DropDisabledFields(&psp.Spec, nil)
}
func (strategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {
newPsp := obj.(*policy.PodSecurityPolicy)
oldPsp := old.(*policy.PodSecurityPolicy)
psputil.DropDisabledFields(&newPsp.Spec)
psputil.DropDisabledFields(&oldPsp.Spec)
psputil.DropDisabledFields(&newPsp.Spec, &oldPsp.Spec)
}
func (strategy) Canonicalize(obj runtime.Object) {

5
pkg/registry/storage/storageclass/strategy.go
View File

@@ -52,7 +52,7 @@ func (storageClassStrategy) PrepareForCreate(ctx context.Context, obj runtime.Ob
class.AllowVolumeExpansion = nil
}
storageutil.DropDisabledFields(class)
storageutil.DropDisabledFields(class, nil)
}
func (storageClassStrategy) Validate(ctx context.Context, obj runtime.Object) field.ErrorList {
@@ -77,8 +77,7 @@ func (storageClassStrategy) PrepareForUpdate(ctx context.Context, obj, old runti
newClass.AllowVolumeExpansion = nil
oldClass.AllowVolumeExpansion = nil
}
storageutil.DropDisabledFields(oldClass)
storageutil.DropDisabledFields(newClass)
storageutil.DropDisabledFields(oldClass, newClass)
}
func (storageClassStrategy) ValidateUpdate(ctx context.Context, obj, old runtime.Object) field.ErrorList {