Merge pull request kubernetes#25202 from roberthbailey/automated-cher…

…ry-pick-of-#24924-upstream-release-1.2 Automated cherry pick of kubernetes#24924 upstream release 1.2
shouhong · May 5, 2016 · 82742c4 · 82742c4
2 parents 4a62da3 + 1a61308
commit 82742c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/registry/horizontalpodautoscaler/strategy.go b/pkg/registry/horizontalpodautoscaler/strategy.go
@@ -70,7 +70,7 @@ func (autoscalerStrategy) AllowCreateOnUpdate() bool {
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
 func (autoscalerStrategy) PrepareForUpdate(obj, old runtime.Object) {
 	newHPA := obj.(*extensions.HorizontalPodAutoscaler)
-	oldHPA := obj.(*extensions.HorizontalPodAutoscaler)
+	oldHPA := old.(*extensions.HorizontalPodAutoscaler)
 	// Update is not allowed to set status
 	newHPA.Status = oldHPA.Status
 }

diff --git a/pkg/registry/persistentvolume/strategy.go b/pkg/registry/persistentvolume/strategy.go
@@ -64,7 +64,7 @@ func (persistentvolumeStrategy) AllowCreateOnUpdate() bool {
 // PrepareForUpdate sets the Status fields which is not allowed to be set by an end user updating a PV
 func (persistentvolumeStrategy) PrepareForUpdate(obj, old runtime.Object) {
 	newPv := obj.(*api.PersistentVolume)
-	oldPv := obj.(*api.PersistentVolume)
+	oldPv := old.(*api.PersistentVolume)
 	newPv.Status = oldPv.Status
 }
 
@@ -86,7 +86,7 @@ var StatusStrategy = persistentvolumeStatusStrategy{Strategy}
 // PrepareForUpdate sets the Spec field which is not allowed to be changed when updating a PV's Status
 func (persistentvolumeStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
 	newPv := obj.(*api.PersistentVolume)
-	oldPv := obj.(*api.PersistentVolume)
+	oldPv := old.(*api.PersistentVolume)
 	newPv.Spec = oldPv.Spec
 }
 

diff --git a/pkg/registry/persistentvolumeclaim/strategy.go b/pkg/registry/persistentvolumeclaim/strategy.go
@@ -64,7 +64,7 @@ func (persistentvolumeclaimStrategy) AllowCreateOnUpdate() bool {
 // PrepareForUpdate sets the Status field which is not allowed to be set by end users on update
 func (persistentvolumeclaimStrategy) PrepareForUpdate(obj, old runtime.Object) {
 	newPvc := obj.(*api.PersistentVolumeClaim)
-	oldPvc := obj.(*api.PersistentVolumeClaim)
+	oldPvc := old.(*api.PersistentVolumeClaim)
 	newPvc.Status = oldPvc.Status
 }
 
@@ -86,7 +86,7 @@ var StatusStrategy = persistentvolumeclaimStatusStrategy{Strategy}
 // PrepareForUpdate sets the Spec field which is not allowed to be changed when updating a PV's Status
 func (persistentvolumeclaimStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
 	newPv := obj.(*api.PersistentVolumeClaim)
-	oldPv := obj.(*api.PersistentVolumeClaim)
+	oldPv := old.(*api.PersistentVolumeClaim)
 	newPv.Spec = oldPv.Spec
 }