github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-22 02:18:51 +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

12
pkg/controller/nodeipam/ipam/controller_legacyprovider.go
View File

@@ -113,7 +113,7 @@ func NewController(
// registers the informers for node changes. This will start synchronization
// of the node and cloud CIDR range allocations.
func (c *Controller) Start(nodeInformer informers.NodeInformer) error {
klog.V(0).Infof("Starting IPAM controller (config=%+v)", c.config)
klog.V(0).InfoS("Starting IPAM controller", "config", c.config)
nodes, err := listNodes(c.adapter.k8s)
if err != nil {
@@ -124,9 +124,9 @@ func (c *Controller) Start(nodeInformer informers.NodeInformer) error {
_, cidrRange, err := netutils.ParseCIDRSloppy(node.Spec.PodCIDR)
if err == nil {
c.set.Occupy(cidrRange)
klog.V(3).Infof("Occupying CIDR for node %q (%v)", node.Name, node.Spec.PodCIDR)
klog.V(3).InfoS("Occupying CIDR for node", "CIDR", node.Spec.PodCIDR, "node", node.Name)
} else {
klog.Errorf("Node %q has an invalid CIDR (%q): %v", node.Name, node.Spec.PodCIDR, err)
klog.ErrorS(err, "Node has an invalid CIDR", "node", node.Name, "CIDR", node.Spec.PodCIDR)
}
}
@@ -194,7 +194,7 @@ func (c *Controller) onAdd(node *v1.Node) error {
c.syncers[node.Name] = syncer
go syncer.Loop(nil)
} else {
klog.Warningf("Add for node %q that already exists", node.Name)
klog.InfoS("Add for node that already exists", "node", node.Name)
}
syncer.Update(node)
@@ -208,7 +208,7 @@ func (c *Controller) onUpdate(_, node *v1.Node) error {
if sync, ok := c.syncers[node.Name]; ok {
sync.Update(node)
} else {
klog.Errorf("Received update for non-existent node %q", node.Name)
klog.ErrorS(nil, "Received update for non-existent node", "node", node.Name)
return fmt.Errorf("unknown node %q", node.Name)
}
@@ -223,7 +223,7 @@ func (c *Controller) onDelete(node *v1.Node) error {
syncer.Delete(node)
delete(c.syncers, node.Name)
} else {
klog.Warningf("Node %q was already deleted", node.Name)
klog.InfoS("Node was already deleted", "node", node.Name)
}
return nil