github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

DaemonSet: Check that ControllerRef UID matches.

Browse Source
This commit is contained in:
Anthony Yeh 2017-03-06 10:48:10 -08:00
parent 97c363a3e0
commit 182753f841
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/controller/daemon/daemoncontroller.go
View File

@ -284,19 +284,15 @@ func (dsc *DaemonSetsController) addPod(obj interface{}) {
// If it has a ControllerRef, that's all that matters. // If it has a ControllerRef, that's all that matters.
if controllerRef := controller.GetControllerOf(pod); controllerRef != nil { if controllerRef := controller.GetControllerOf(pod); controllerRef != nil {
if controllerRef.Kind != controllerKind.Kind { ds := dsc.resolveControllerRef(pod.Namespace, controllerRef)
// It's controlled by a different type of controller. if ds == nil {
return
}
glog.V(4).Infof("Pod %s added.", pod.Name)
ds, err := dsc.dsLister.DaemonSets(pod.Namespace).Get(controllerRef.Name)
if err != nil {
return return
} }
dsKey, err := controller.KeyFunc(ds) dsKey, err := controller.KeyFunc(ds)
if err != nil { if err != nil {
return return
} }
glog.V(4).Infof("Pod %s added.", pod.Name)
dsc.expectations.CreationObserved(dsKey) dsc.expectations.CreationObserved(dsKey)
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
return return
@ -333,26 +329,20 @@ func (dsc *DaemonSetsController) updatePod(old, cur interface{}) {
curControllerRef := controller.GetControllerOf(curPod) curControllerRef := controller.GetControllerOf(curPod)
oldControllerRef := controller.GetControllerOf(oldPod) oldControllerRef := controller.GetControllerOf(oldPod)
controllerRefChanged := !reflect.DeepEqual(curControllerRef, oldControllerRef) controllerRefChanged := !reflect.DeepEqual(curControllerRef, oldControllerRef)
if controllerRefChanged && if controllerRefChanged && oldControllerRef != nil {
oldControllerRef != nil && oldControllerRef.Kind == controllerKind.Kind {
// The ControllerRef was changed. Sync the old controller, if any. // The ControllerRef was changed. Sync the old controller, if any.
ds, err := dsc.dsLister.DaemonSets(oldPod.Namespace).Get(oldControllerRef.Name) if ds := dsc.resolveControllerRef(oldPod.Namespace, oldControllerRef); ds != nil {
if err == nil {
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
} }
} }
// If it has a ControllerRef, that's all that matters. // If it has a ControllerRef, that's all that matters.
if curControllerRef != nil { if curControllerRef != nil {
if curControllerRef.Kind != controllerKind.Kind { ds := dsc.resolveControllerRef(curPod.Namespace, curControllerRef)
// It's controlled by a different type of controller. if ds == nil {
return return
} }
glog.V(4).Infof("Pod %s updated.", curPod.Name) glog.V(4).Infof("Pod %s updated.", curPod.Name)
ds, err := dsc.dsLister.DaemonSets(curPod.Namespace).Get(curControllerRef.Name)
if err != nil {
return
}
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
// See https://github.com/kubernetes/kubernetes/pull/38076 for more details // See https://github.com/kubernetes/kubernetes/pull/38076 for more details
if changedToReady && ds.Spec.MinReadySeconds > 0 { if changedToReady && ds.Spec.MinReadySeconds > 0 {
@ -400,20 +390,15 @@ func (dsc *DaemonSetsController) deletePod(obj interface{}) {
// No controller should care about orphans being deleted. // No controller should care about orphans being deleted.
return return
} }
if controllerRef.Kind != controllerKind.Kind { ds := dsc.resolveControllerRef(pod.Namespace, controllerRef)
// It's controlled by a different type of controller. if ds == nil {
return
}
glog.V(4).Infof("Pod %s deleted.", pod.Name)
ds, err := dsc.dsLister.DaemonSets(pod.Namespace).Get(controllerRef.Name)
if err != nil {
return return
} }
dsKey, err := controller.KeyFunc(ds) dsKey, err := controller.KeyFunc(ds)
if err != nil { if err != nil {
return return
} }
glog.V(4).Infof("Pod %s deleted.", pod.Name)
dsc.expectations.DeletionObserved(dsKey) dsc.expectations.DeletionObserved(dsKey)
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
} }
@ -498,6 +483,27 @@ func (dsc *DaemonSetsController) getNodesToDaemonPods(ds *extensions.DaemonSet)
return nodeToDaemonPods, nil return nodeToDaemonPods, nil
} }
// resolveControllerRef returns the controller referenced by a ControllerRef,
// or nil if the ControllerRef could not be resolved to a matching controller
// of the corrrect Kind.
func (dsc *DaemonSetsController) resolveControllerRef(namespace string, controllerRef *metav1.OwnerReference) *extensions.DaemonSet {
// We can't look up by UID, so look up by Name and then verify UID.
// Don't even try to look up by Name if it's the wrong Kind.
if controllerRef.Kind != controllerKind.Kind {
return nil
}
ds, err := dsc.dsLister.DaemonSets(namespace).Get(controllerRef.Name)
if err != nil {
return nil
}
if ds.UID != controllerRef.UID {
// The controller we found with this Name is not the same one that the
// ControllerRef points to.
return nil
}
return ds
}
func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) error { func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) error {
// For each node, if the node is running the daemon pod but isn't supposed to, kill the daemon // For each node, if the node is running the daemon pod but isn't supposed to, kill the daemon
// pod. If the node is supposed to run the daemon pod, but isn't, create the daemon pod on the node. // pod. If the node is supposed to run the daemon pod, but isn't, create the daemon pod on the node.