github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 11:12:03 +00:00
Code Issues Projects Releases Wiki Activity

namespace controller: use contextual logging

Browse Source
This commit is contained in:
JunYang
2022-10-29 22:34:47 +08:00
committed by 杨军10092085
parent a35650b833
commit f5bd8c86d4
7 changed files with 113 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e_node/services/internal_services.go
View File

@@ -17,11 +17,13 @@ limitations under the License.
package services
import (
"context"
"os"
"testing"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/klog/v2/ktesting"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/klog/v2"
@@ -55,6 +57,7 @@ func (es *e2eServices) run(t *testing.T) error {
// start starts the tests embedded services or returns an error.
func (es *e2eServices) start(t *testing.T) error {
_, ctx := ktesting.NewTestContext(t)
klog.Info("Starting e2e services...")
err := es.startEtcd(t)
if err != nil {
@@ -64,7 +67,7 @@ func (es *e2eServices) start(t *testing.T) error {
if err != nil {
return err
}
err = es.startNamespaceController()
err = es.startNamespaceController(ctx)
if err != nil {
return nil
}
@@ -124,10 +127,10 @@ func (es *e2eServices) startAPIServer(etcdStorage *storagebackend.Config) error
}
// startNamespaceController starts the embedded namespace controller or returns an error.
func (es *e2eServices) startNamespaceController() error {
klog.Info("Starting namespace controller")
func (es *e2eServices) startNamespaceController(ctx context.Context) error {
klog.FromContext(ctx).Info("Starting namespace controller")
es.nsController = NewNamespaceController(framework.TestContext.Host)
return es.nsController.Start()
return es.nsController.Start(ctx)
}
// getServicesHealthCheckURLs returns the health check urls for the internal services.

7
test/e2e_node/services/namespace_controller.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package services
import (
"context"
"time"
v1 "k8s.io/api/core/v1"
@@ -49,7 +50,7 @@ func NewNamespaceController(host string) *NamespaceController {
}
// Start starts the namespace controller.
func (n *NamespaceController) Start() error {
func (n *NamespaceController) Start(ctx context.Context) error {
config := restclient.AddUserAgent(&restclient.Config{
Host: n.host,
BearerToken: framework.TestContext.BearerToken,
@@ -72,7 +73,9 @@ func (n *NamespaceController) Start() error {
}
discoverResourcesFn := client.Discovery().ServerPreferredNamespacedResources
informerFactory := informers.NewSharedInformerFactory(client, ncResyncPeriod)
nc := namespacecontroller.NewNamespaceController(
ctx,
client,
metadataClient,
discoverResourcesFn,
@@ -80,7 +83,7 @@ func (n *NamespaceController) Start() error {
ncResyncPeriod, v1.FinalizerKubernetes,
)
informerFactory.Start(n.stopCh)
go nc.Run(ncConcurrency, n.stopCh)
go nc.Run(ctx, ncConcurrency)
return nil
}