Skip to content

K
k3s
Commit 36809e2c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39366 from zdj6373/manager-log

Automatic merge from submit-queue (batch tested with PRs 40527, 40738, 39366, 40609, 40748) Log rectification Log error, modify
parents adbb9753 540f3bb7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/controller/controller_ref_manager.go
View file @ 36809e2c
...@@ -109,7 +109,7 @@ func GetControllerOf(controllee *metav1.ObjectMeta) *metav1.OwnerReference { ...@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment