github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 18:11:22 +00:00
Code Issues Projects Releases Wiki Activity

Plumb old pod spec into DropDisabledFields methods

Browse Source
This commit is contained in:
Jordan Liggitt
2018-12-17 12:49:29 -05:00
parent 49028df5f9
commit e486d486b1
11 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/apps/daemonset/strategy.go
View File

@@ -75,7 +75,7 @@ func (daemonSetStrategy) PrepareForCreate(ctx context.Context, obj runtime.Objec
daemonSet.Spec.TemplateGeneration = 1
}
pod.DropDisabledFields(&daemonSet.Spec.Template.Spec)
pod.DropDisabledFields(&daemonSet.Spec.Template.Spec, nil)
}
// PrepareForUpdate clears fields that are not allowed to be set by end users on update.
@@ -83,8 +83,7 @@ func (daemonSetStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.
newDaemonSet := obj.(*apps.DaemonSet)
oldDaemonSet := old.(*apps.DaemonSet)
pod.DropDisabledFields(&newDaemonSet.Spec.Template.Spec)
pod.DropDisabledFields(&oldDaemonSet.Spec.Template.Spec)
pod.DropDisabledFields(&newDaemonSet.Spec.Template.Spec, &oldDaemonSet.Spec.Template.Spec)
// update is not allowed to set status
newDaemonSet.Status = oldDaemonSet.Status

5
pkg/registry/apps/deployment/strategy.go
View File

@@ -73,7 +73,7 @@ func (deploymentStrategy) PrepareForCreate(ctx context.Context, obj runtime.Obje
deployment.Status = apps.DeploymentStatus{}
deployment.Generation = 1
pod.DropDisabledFields(&deployment.Spec.Template.Spec)
pod.DropDisabledFields(&deployment.Spec.Template.Spec, nil)
}
// Validate validates a new deployment.
@@ -97,8 +97,7 @@ func (deploymentStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime
oldDeployment := old.(*apps.Deployment)
newDeployment.Status = oldDeployment.Status
pod.DropDisabledFields(&newDeployment.Spec.Template.Spec)
pod.DropDisabledFields(&oldDeployment.Spec.Template.Spec)
pod.DropDisabledFields(&newDeployment.Spec.Template.Spec, &oldDeployment.Spec.Template.Spec)
// Spec updates bump the generation so that we can distinguish between
// scaling events and template changes, annotation updates bump the generation

5
pkg/registry/apps/replicaset/strategy.go
View File

@@ -80,7 +80,7 @@ func (rsStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
rs.Generation = 1
pod.DropDisabledFields(&rs.Spec.Template.Spec)
pod.DropDisabledFields(&rs.Spec.Template.Spec, nil)
}
// PrepareForUpdate clears fields that are not allowed to be set by end users on update.
@@ -90,8 +90,7 @@ func (rsStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object)
// update is not allowed to set status
newRS.Status = oldRS.Status
pod.DropDisabledFields(&newRS.Spec.Template.Spec)
pod.DropDisabledFields(&oldRS.Spec.Template.Spec)
pod.DropDisabledFields(&newRS.Spec.Template.Spec, &oldRS.Spec.Template.Spec)
// Any changes to the spec increment the generation number, any changes to the
// status should reflect the generation number of the corresponding object. We push

5
pkg/registry/apps/statefulset/strategy.go
View File

@@ -72,7 +72,7 @@ func (statefulSetStrategy) PrepareForCreate(ctx context.Context, obj runtime.Obj
statefulSet.Generation = 1
pod.DropDisabledFields(&statefulSet.Spec.Template.Spec)
pod.DropDisabledFields(&statefulSet.Spec.Template.Spec, nil)
}
// PrepareForUpdate clears fields that are not allowed to be set by end users on update.
@@ -82,8 +82,7 @@ func (statefulSetStrategy) PrepareForUpdate(ctx context.Context, obj, old runtim
// Update is not allowed to set status
newStatefulSet.Status = oldStatefulSet.Status
pod.DropDisabledFields(&newStatefulSet.Spec.Template.Spec)
pod.DropDisabledFields(&oldStatefulSet.Spec.Template.Spec)
pod.DropDisabledFields(&newStatefulSet.Spec.Template.Spec, &oldStatefulSet.Spec.Template.Spec)
// Any changes to the spec increment the generation number, any changes to the
// status should reflect the generation number of the corresponding object.