github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 01:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100672 from wangyx1992/structured-log

Browse Source 
Structured Logging migration: modify logs of controller-manager
This commit is contained in:
Kubernetes Prow Robot
2021-09-22 20:27:10 -07:00
committed by GitHub
parent 86003a2a76 7175d82a27
commit 372103f4b8
6 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controlplane/controller/apiserverleasegc/gc_controller.go
View File

@@ -93,7 +93,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
func (c *Controller) gc() {
leases, err := c.leaseLister.Leases(c.leaseNamespace).List(labels.Everything())
if err != nil {
klog.Errorf("Error while listing apiserver leases: %v", err)
klog.ErrorS(err, "Error while listing apiserver leases")
return
}
for _, lease := range leases {
@@ -104,14 +104,14 @@ func (c *Controller) gc() {
// double check latest lease from apiserver before deleting
lease, err := c.kubeclientset.CoordinationV1().Leases(c.leaseNamespace).Get(context.TODO(), lease.Name, metav1.GetOptions{})
if err != nil && !errors.IsNotFound(err) {
klog.Errorf("Error getting lease: %v", err)
klog.ErrorS(err, "Error getting lease")
continue
}
if errors.IsNotFound(err) || lease == nil {
// In an HA cluster, this can happen if the lease was deleted
// by the same GC controller in another apiserver, which is legit.
// We don't expect other components to delete the lease.
klog.V(4).Infof("cannot find apiserver lease: %v", err)
klog.V(4).InfoS("Cannot find apiserver lease", "err", err)
continue
}
// evaluate lease from apiserver
@@ -124,9 +124,9 @@ func (c *Controller) gc() {
// In an HA cluster, this can happen if the lease was deleted
// by the same GC controller in another apiserver, which is legit.
// We don't expect other components to delete the lease.
klog.V(4).Infof("apiserver lease is gone already: %v", err)
klog.V(4).InfoS("Apiserver lease is gone already", "err", err)
} else {
klog.Errorf("Error deleting lease: %v", err)
klog.ErrorS(err, "Error deleting lease")
}
}
}