github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Deployment: Remove Overlap and SelectorUpdate annotations.

Browse Source 
These are not used anymore since ControllerRef now protects against
fighting between controllers with overlapping selectors.
This commit is contained in:
Anthony Yeh
2017-03-06 11:54:43 -08:00
parent 94b3c216a1
commit cec3899b96
7 changed files with 0 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/stop.go
View File

@@ -441,11 +441,6 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
return err
}
// Do not cascade deletion for overlapping deployments.
if len(deployment.Annotations[deploymentutil.OverlapAnnotation]) > 0 {
return deployments.Delete(name, nil)
}
// Stop all replica sets.
selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector)
if err != nil {