github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113916 from songxiao-wang87/runwxs-test1

Browse Source 
Migrate ttl_controller to contextual logging
This commit is contained in:
Kubernetes Prow Robot
2023-03-07 04:18:30 -08:00
committed by GitHub
parent 8c97443b7b 8c7f3c2116
commit 471b392f43
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/core.go
View File

@@ -490,7 +490,9 @@ func startServiceAccountController(ctx context.Context, controllerContext Contro
}
func startTTLController(ctx context.Context, controllerContext ControllerContext) (controller.Interface, bool, error) {
ctx = klog.NewContext(ctx, klog.LoggerWithName(klog.FromContext(ctx), "ttl"))
go ttlcontroller.NewTTLController(
ctx,
controllerContext.InformerFactory.Core().V1().Nodes(),
controllerContext.ClientBuilder.ClientOrDie("ttl-controller"),
).Run(ctx, 5)

44
pkg/controller/ttl/ttl_controller.go
View File

@@ -78,15 +78,19 @@ type Controller struct {
}
// NewTTLController creates a new TTLController
func NewTTLController(nodeInformer informers.NodeInformer, kubeClient clientset.Interface) *Controller {
func NewTTLController(ctx context.Context, nodeInformer informers.NodeInformer, kubeClient clientset.Interface) *Controller {
ttlc := &Controller{
kubeClient: kubeClient,
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ttlcontroller"),
}
logger := klog.FromContext(ctx)
nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: ttlc.addNode,
UpdateFunc: ttlc.updateNode,
AddFunc: func(obj interface{}) {
ttlc.addNode(logger, obj)
},
UpdateFunc: func(old, newObj interface{}) {
ttlc.updateNode(logger, old, newObj)
},
DeleteFunc: ttlc.deleteNode,
})
@@ -116,9 +120,9 @@ var (
func (ttlc *Controller) Run(ctx context.Context, workers int) {
defer utilruntime.HandleCrash()
defer ttlc.queue.ShutDown()
klog.Infof("Starting TTL controller")
defer klog.Infof("Shutting down TTL controller")
logger := klog.FromContext(ctx)
logger.Info("Starting TTL controller")
defer logger.Info("Shutting down TTL controller")
if !cache.WaitForNamedCacheSync("TTL", ctx.Done(), ttlc.hasSynced) {
return
@@ -131,7 +135,7 @@ func (ttlc *Controller) Run(ctx context.Context, workers int) {
<-ctx.Done()
}
func (ttlc *Controller) addNode(obj interface{}) {
func (ttlc *Controller) addNode(logger klog.Logger, obj interface{}) {
node, ok := obj.(*v1.Node)
if !ok {
utilruntime.HandleError(fmt.Errorf("unexpected object type: %v", obj))
@@ -147,10 +151,10 @@ func (ttlc *Controller) addNode(obj interface{}) {
ttlc.desiredTTLSeconds = ttlBoundaries[ttlc.boundaryStep].ttlSeconds
}
}()
ttlc.enqueueNode(node)
ttlc.enqueueNode(logger, node)
}
func (ttlc *Controller) updateNode(_, newObj interface{}) {
func (ttlc *Controller) updateNode(logger klog.Logger, _, newObj interface{}) {
node, ok := newObj.(*v1.Node)
if !ok {
utilruntime.HandleError(fmt.Errorf("unexpected object type: %v", newObj))
@@ -161,7 +165,7 @@ func (ttlc *Controller) updateNode(_, newObj interface{}) {
// We are relying on the fact that Kubelet is updating node status
// every 10s (or generally every X seconds), which means that whenever
// required, its ttl annotation should be updated within that period.
ttlc.enqueueNode(node)
ttlc.enqueueNode(logger, node)
}
func (ttlc *Controller) deleteNode(obj interface{}) {
@@ -191,10 +195,10 @@ func (ttlc *Controller) deleteNode(obj interface{}) {
// We are not processing the node, as it no longer exists.
}
func (ttlc *Controller) enqueueNode(node *v1.Node) {
func (ttlc *Controller) enqueueNode(logger klog.Logger, node *v1.Node) {
key, err := controller.KeyFunc(node)
if err != nil {
klog.Errorf("Couldn't get key for object %+v", node)
logger.Error(nil, "Couldn't get key for object", "object", klog.KObj(node))
return
}
ttlc.queue.Add(key)
@@ -229,7 +233,7 @@ func (ttlc *Controller) getDesiredTTLSeconds() int {
return ttlc.desiredTTLSeconds
}
func getIntFromAnnotation(node *v1.Node, annotationKey string) (int, bool) {
func getIntFromAnnotation(ctx context.Context, node *v1.Node, annotationKey string) (int, bool) {
if node.Annotations == nil {
return 0, false
}
@@ -239,8 +243,9 @@ func getIntFromAnnotation(node *v1.Node, annotationKey string) (int, bool) {
}
intValue, err := strconv.Atoi(annotationValue)
if err != nil {
klog.Warningf("Cannot convert the value %q with annotation key %q for the node %q",
annotationValue, annotationKey, node.Name)
logger := klog.FromContext(ctx)
logger.Info("Could not convert the value with annotation key for the node", "annotationValue",
annotationValue, "annotationKey", annotationKey, "node", klog.KObj(node))
return 0, false
}
return intValue, true
@@ -268,11 +273,12 @@ func (ttlc *Controller) patchNodeWithAnnotation(ctx context.Context, node *v1.No
return err
}
_, err = ttlc.kubeClient.CoreV1().Nodes().Patch(ctx, node.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{})
logger := klog.FromContext(ctx)
if err != nil {
klog.V(2).InfoS("Failed to change ttl annotation for node", "node", klog.KObj(node), "err", err)
logger.V(2).Info("Failed to change ttl annotation for node", "node", klog.KObj(node), "err", err)
return err
}
klog.V(2).InfoS("Changed ttl annotation", "node", klog.KObj(node), "TTL", time.Duration(value)*time.Second)
logger.V(2).Info("Changed ttl annotation", "node", klog.KObj(node), "TTL", time.Duration(value)*time.Second)
return nil
}
@@ -286,7 +292,7 @@ func (ttlc *Controller) updateNodeIfNeeded(ctx context.Context, key string) erro
}
desiredTTL := ttlc.getDesiredTTLSeconds()
currentTTL, ok := getIntFromAnnotation(node, v1.ObjectTTLAnnotationKey)
currentTTL, ok := getIntFromAnnotation(ctx, node, v1.ObjectTTLAnnotationKey)
if ok && currentTTL == desiredTTL {
return nil
}

4
pkg/controller/ttl/ttl_controller_test.go
View File

@@ -27,6 +27,7 @@ import (
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog/v2/ktesting"
"github.com/stretchr/testify/assert"
)
@@ -235,7 +236,8 @@ func TestDesiredTTL(t *testing.T) {
boundaryStep: testCase.boundaryStep,
}
if testCase.addNode {
ttlController.addNode(&v1.Node{})
logger, _ := ktesting.NewTestContext(t)
ttlController.addNode(logger, &v1.Node{})
}
if testCase.deleteNode {
ttlController.deleteNode(&v1.Node{})

6
test/integration/ttlcontroller/ttlcontroller_test.go
View File

@@ -32,6 +32,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
listers "k8s.io/client-go/listers/core/v1"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2/ktesting"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/controller/ttl"
"k8s.io/kubernetes/test/integration/framework"
@@ -137,9 +138,10 @@ func TestTTLAnnotations(t *testing.T) {
testClient, informers := createClientAndInformers(t, server)
nodeInformer := informers.Core().V1().Nodes()
ttlc := ttl.NewTTLController(nodeInformer, testClient)
_, ctx := ktesting.NewTestContext(t)
ttlc := ttl.NewTTLController(ctx, nodeInformer, testClient)
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(ctx)
defer cancel()
go nodeInformer.Informer().Run(ctx.Done())
go ttlc.Run(ctx, 1)