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

pkg/registry/controller/strategy.go

@@ -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
 	}

pkg/registry/replicaset/strategy.go

@@ -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
 	}