github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deployment: Filter Pods by Deployment selector in addition to ControllerRef.

Browse Source 
Deployment should ignore Pods that don't match the selector, even if
they have a ControllerRef pointing to one of the ReplicaSets it owns.
The ReplicaSet itself will orphan the Pod as soon as it syncs.
This commit is contained in:
Anthony Yeh
2017-03-03 16:10:27 -08:00
parent 37534b66df
commit d96c4847b6
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/controller/deployment/deployment_controller.go
View File

@@ -371,7 +371,7 @@ func (dc *DeploymentController) deletePod(obj interface{}) {
if err != nil {
return
}
podMap, err := dc.getPodMapForReplicaSets(d.Namespace, rsList)
podMap, err := dc.getPodMapForDeployment(d, rsList)
if err != nil {
return
}
@@ -506,11 +506,17 @@ func (dc *DeploymentController) getReplicaSetsForDeployment(d *extensions.Deploy
return cm.ClaimReplicaSets(rsList)
}
// getPodMapForReplicaSets scans the list of all Pods and returns a map from
// RS UID to Pods controlled by that RS, based on the Pod's ControllerRef.
func (dc *DeploymentController) getPodMapForReplicaSets(namespace string, rsList []*extensions.ReplicaSet) (map[types.UID]*v1.PodList, error) {
// List all Pods.
pods, err := dc.podLister.Pods(namespace).List(labels.Everything())
// getPodMapForDeployment returns the Pods managed by a Deployment.
//
// It returns a map from ReplicaSet UID to a list of Pods controlled by that RS,
// according to the Pod's ControllerRef.
func (dc *DeploymentController) getPodMapForDeployment(d *extensions.Deployment, rsList []*extensions.ReplicaSet) (map[types.UID]*v1.PodList, error) {
// Get all Pods that potentially belong to this Deployment.
selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector)
if err != nil {
return nil, err
}
pods, err := dc.podLister.Pods(d.Namespace).List(selector)
if err != nil {
return nil, err
}
@@ -583,8 +589,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
return err
}
// List all Pods owned by this Deployment, grouped by their ReplicaSet.
// This is expensive, so do it once and pass it along to subroutines.
podMap, err := dc.getPodMapForReplicaSets(d.Namespace, rsList)
podMap, err := dc.getPodMapForDeployment(d, rsList)
if err != nil {
return err
}