// handleOverlap relists all deployment in the same namespace for overlaps, and avoid syncing // the newer overlapping ones (only sync the oldest one). New/old is determined by when the // deployment's selector is last updated. func (dc *DeploymentController) handleOverlap(d *extensions.Deployment) error { selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return fmt.Errorf("deployment %s/%s has invalid label selector: %v", d.Namespace, d.Name, err) } deployments, err := dc.dLister.Deployments(d.Namespace).List(labels.Everything()) if err != nil { return fmt.Errorf("error listing deployments in namespace %s: %v", d.Namespace, err) } overlapping := false for _, other := range deployments { if !selector.Empty() && selector.Matches(labels.Set(other.Spec.Template.Labels)) && d.UID != other.UID { deploymentCopy, err := util.DeploymentDeepCopy(other) if err != nil { return err } overlapping = true // Skip syncing this one if older overlapping one is found. if util.SelectorUpdatedBefore(deploymentCopy, d) { // We don't care if the overlapping annotation update failed or not (we don't make decision on it) dc.markDeploymentOverlap(d, deploymentCopy.Name) dc.clearDeploymentOverlap(deploymentCopy) return fmt.Errorf("found deployment %s/%s has overlapping selector with an older deployment %s/%s, skip syncing it", d.Namespace, d.Name, deploymentCopy.Namespace, deploymentCopy.Name) } dc.markDeploymentOverlap(deploymentCopy, d.Name) d, _ = dc.clearDeploymentOverlap(d) } } if !overlapping { // We don't care if the overlapping annotation update failed or not (we don't make decision on it) d, _ = dc.clearDeploymentOverlap(d) } return nil }
// handleOverlap relists all deployment in the same namespace for overlaps, and avoid syncing // the newer overlapping ones (only sync the oldest one). New/old is determined by when the // deployment's selector is last updated. func (dc *DeploymentController) handleOverlap(d *extensions.Deployment) error { selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return fmt.Errorf("deployment %s/%s has invalid label selector: %v", d.Namespace, d.Name, err) } deployments, err := dc.dStore.Deployments(d.Namespace).List(labels.Everything()) if err != nil { return fmt.Errorf("error listing deployments in namespace %s: %v", d.Namespace, err) } overlapping := false for i := range deployments { other := &deployments[i] if !selector.Empty() && selector.Matches(labels.Set(other.Spec.Template.Labels)) && d.UID != other.UID { overlapping = true // We don't care if the overlapping annotation update failed or not (we don't make decision on it) d, _ = dc.markDeploymentOverlap(d, other.Name) other, _ = dc.markDeploymentOverlap(other, d.Name) // Skip syncing this one if older overlapping one is found // TODO: figure out a better way to determine which deployment to skip, // either with controller reference, or with validation. // Using oldest active replica set to determine which deployment to skip wouldn't make much difference, // since new replica set hasn't been created after selector update if util.SelectorUpdatedBefore(other, d) { return fmt.Errorf("found deployment %s/%s has overlapping selector with an older deployment %s/%s, skip syncing it", d.Namespace, d.Name, other.Namespace, other.Name) } } } if !overlapping { // We don't care if the overlapping annotation update failed or not (we don't make decision on it) d, _ = dc.clearDeploymentOverlap(d) } return nil }
// handleOverlap relists all deployment in the same namespace for overlaps, and avoid syncing // the newer overlapping ones (only sync the oldest one). New/old is determined by when the // deployment's selector is last updated. func (dc *DeploymentController) handleOverlap(d *extensions.Deployment) error { deployments, err := dc.dLister.Deployments(d.Namespace).List(labels.Everything()) if err != nil { return fmt.Errorf("error listing deployments in namespace %s: %v", d.Namespace, err) } overlapping := false for _, other := range deployments { foundOverlaps, err := util.OverlapsWith(d, other) if err != nil { return err } if foundOverlaps { deploymentCopy, err := util.DeploymentDeepCopy(other) if err != nil { return err } overlapping = true // Skip syncing this one if older overlapping one is found. if util.SelectorUpdatedBefore(deploymentCopy, d) { // We don't care if the overlapping annotation update failed or not (we don't make decision on it) dc.markDeploymentOverlap(d, deploymentCopy.Name) dc.clearDeploymentOverlap(deploymentCopy) return fmt.Errorf("found deployment %s/%s has overlapping selector with an older deployment %s/%s, skip syncing it", d.Namespace, d.Name, deploymentCopy.Namespace, deploymentCopy.Name) } dc.markDeploymentOverlap(deploymentCopy, d.Name) d, _ = dc.clearDeploymentOverlap(d) } } if !overlapping { // We don't care if the overlapping annotation update failed or not (we don't make decision on it) d, _ = dc.clearDeploymentOverlap(d) } return nil }
// handleOverlap will avoid syncing the newer overlapping ones (only sync the oldest one). New/old is // determined by when the deployment's selector is last updated. func (dc *DeploymentController) handleOverlap(d *extensions.Deployment, deployments []*extensions.Deployment) (bool, error) { overlapping := false var errs []error for i := range deployments { otherD := deployments[i] if d.Name == otherD.Name { continue } // Error is already checked during validation foundOverlaps, _ := util.OverlapsWith(d, otherD) // If the otherD deployment overlaps with the current we need to identify which one // holds the set longer and mark the other as overlapping. Requeue the overlapping // deployments if this one has been marked deleted, we only update its status as long // as it is not actually deleted. if foundOverlaps && d.DeletionTimestamp == nil { overlapping = true // Look at the overlapping annotation in both deployments. If one of them has it and points // to the other one then we don't need to compare their timestamps. otherOverlapsWith := otherD.Annotations[util.OverlapAnnotation] currentOverlapsWith := d.Annotations[util.OverlapAnnotation] // The other deployment is already marked as overlapping with the current one. if otherOverlapsWith == d.Name { var err error if d, err = dc.clearDeploymentOverlap(d, otherD.Name); err != nil { errs = append(errs, err) } continue } otherCopy, err := util.DeploymentDeepCopy(otherD) if err != nil { return false, err } // Skip syncing this one if older overlapping one is found. if currentOverlapsWith == otherCopy.Name || util.SelectorUpdatedBefore(otherCopy, d) { if _, err = dc.markDeploymentOverlap(d, otherCopy.Name); err != nil { return false, err } if _, err = dc.clearDeploymentOverlap(otherCopy, d.Name); err != nil { return false, err } return true, fmt.Errorf("deployment %s/%s has overlapping selector with an older deployment %s/%s, skip syncing it", d.Namespace, d.Name, otherCopy.Namespace, otherCopy.Name) } // TODO: We need to support annotations in deployments that overlap with multiple other // deployments. if _, err = dc.markDeploymentOverlap(otherCopy, d.Name); err != nil { errs = append(errs, err) } // This is going to get some deployments into update hotlooping if we remove the overlapping // annotation unconditionally. // // Scenario: // --> Deployment foo with label selector A=A is created. // --> Deployment bar with label selector A=A,B=B is created. Marked as overlapping since it // overlaps with foo. // --> Deployment baz with label selector B=B is created. Marked as overlapping, since it // overlaps with bar, bar overlapping annotation is cleaned up. Next sync loop marks bar // as overlapping and it gets in an update hotloop. if d, err = dc.clearDeploymentOverlap(d, otherCopy.Name); err != nil { errs = append(errs, err) } continue } // If the otherD deployment does not overlap with the current deployment *anymore* // we need to cleanup otherD from the overlapping annotation so it can be synced by // the deployment controller. dName, hasOverlappingAnnotation := otherD.Annotations[util.OverlapAnnotation] if hasOverlappingAnnotation && dName == d.Name { otherCopy, err := util.DeploymentDeepCopy(otherD) if err != nil { return false, err } if _, err = dc.clearDeploymentOverlap(otherCopy, d.Name); err != nil { errs = append(errs, err) } } } if !overlapping { var err error if d, err = dc.clearDeploymentOverlap(d, ""); err != nil { errs = append(errs, err) } } return false, utilerrors.NewAggregate(errs) }