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

Log rectification,review

Browse Source
This commit is contained in:
zdj6373
2017-01-14 10:03:57 +08:00
parent 27e3398297
commit 540f3bb7f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/controller_ref_manager.go
View File

@@ -109,7 +109,7 @@ func GetControllerOf(controllee *v1.ObjectMeta) *metav1.OwnerReference {
func (m *PodControllerRefManager) AdoptPod(pod *v1.Pod) error { func (m *PodControllerRefManager) AdoptPod(pod *v1.Pod) error {
// we should not adopt any pods if the controller is about to be deleted // we should not adopt any pods if the controller is about to be deleted
if m.controllerObject.DeletionTimestamp != nil { if m.controllerObject.DeletionTimestamp != nil {
return fmt.Errorf("cancel the adopt attempt for pod %s because the controlller is being deleted", return fmt.Errorf("cancel the adopt attempt for pod %s because the controller is being deleted",
strings.Join([]string{pod.Namespace, pod.Name, string(pod.UID)}, "_")) strings.Join([]string{pod.Namespace, pod.Name, string(pod.UID)}, "_"))
} }
addControllerPatch := fmt.Sprintf( addControllerPatch := fmt.Sprintf(