github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39366 from zdj6373/manager-log

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40527, 40738, 39366, 40609, 40748)

Log rectification

Log error, modify
This commit is contained in:
Kubernetes Submit Queue 2017-01-31 15:49:43 -08:00 committed by GitHub
commit 36809e2c2e
1 changed files with 1 additions and 1 deletions
Show Stats 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 *metav1.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(