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

Merge pull request #21687 from kargakis/generation-updates-for-label-annotation-changes

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-23 07:51:48 -08:00
commit d0ce85a6d1
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/controller/strategy.go
View File

@ -69,9 +69,6 @@ func (rcStrategy) PrepareForUpdate(obj, old runtime.Object) {
// status its own object, and even if we don't, writes may be the result of a
// read-update-write loop, so the contents of spec may not actually be the spec that
// the controller has *seen*.
//
// TODO: Any changes to a part of the object that represents desired state (labels,
// annotations etc) should also increment the generation.
if !reflect.DeepEqual(oldController.Spec, newController.Spec) {
newController.Generation = oldController.Generation + 1
}

3
pkg/registry/replicaset/strategy.go
View File

@ -70,9 +70,6 @@ func (rsStrategy) PrepareForUpdate(obj, old runtime.Object) {
// status its own object, and even if we don't, writes may be the result of a
// read-update-write loop, so the contents of spec may not actually be the spec that
// the ReplicaSet has *seen*.
//
// TODO: Any changes to a part of the object that represents desired state (labels,
// annotations etc) should also increment the generation.
if !reflect.DeepEqual(oldRS.Spec, newRS.Spec) {
newRS.Generation = oldRS.Generation + 1
}