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

add ns info for pod in log

Browse Source
This commit is contained in:
tanshanshan 2018-08-01 16:25:34 +08:00
parent 28b6fb5f7d
commit 623278fdba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/podgc/gc_controller.go
View File

@ -59,7 +59,7 @@ func NewPodGC(kubeClient clientset.Interface, podInformer coreinformers.PodInfor
kubeClient: kubeClient, kubeClient: kubeClient,
terminatedPodThreshold: terminatedPodThreshold, terminatedPodThreshold: terminatedPodThreshold,
deletePod: func(namespace, name string) error { deletePod: func(namespace, name string) error {
glog.Infof("PodGC is force deleting Pod: %v:%v", namespace, name) glog.Infof("PodGC is force deleting Pod: %v/%v", namespace, name)
return kubeClient.CoreV1().Pods(namespace).Delete(name, metav1.NewDeleteOptions(0)) return kubeClient.CoreV1().Pods(namespace).Delete(name, metav1.NewDeleteOptions(0))
}, },
} }
@ -159,11 +159,11 @@ func (gcc *PodGCController) gcOrphaned(pods []*v1.Pod) {
if nodeNames.Has(pod.Spec.NodeName) { if nodeNames.Has(pod.Spec.NodeName) {
continue continue
} }
glog.V(2).Infof("Found orphaned Pod %v assigned to the Node %v. Deleting.", pod.Name, pod.Spec.NodeName) glog.V(2).Infof("Found orphaned Pod %v/%v assigned to the Node %v. Deleting.", pod.Namespace, pod.Name, pod.Spec.NodeName)
if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil { if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } else {
glog.V(0).Infof("Forced deletion of orphaned Pod %s succeeded", pod.Name) glog.V(0).Infof("Forced deletion of orphaned Pod %v/%v succeeded", pod.Namespace, pod.Name)
} }
} }
} }
@ -177,11 +177,11 @@ func (gcc *PodGCController) gcUnscheduledTerminating(pods []*v1.Pod) {
continue continue
} }
glog.V(2).Infof("Found unscheduled terminating Pod %v not assigned to any Node. Deleting.", pod.Name) glog.V(2).Infof("Found unscheduled terminating Pod %v/%v not assigned to any Node. Deleting.", pod.Namespace, pod.Name)
if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil { if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } else {
glog.V(0).Infof("Forced deletion of unscheduled terminating Pod %s succeeded", pod.Name) glog.V(0).Infof("Forced deletion of unscheduled terminating Pod %v/%v succeeded", pod.Namespace, pod.Name)
} }
} }
} }