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

Merge pull request #98138 from lala123912/log_format_admission

Browse Source 
staging/src/k8s.io/apiserver/pkg/admission: migrate to structured logs
This commit is contained in:
Kubernetes Prow Robot
2021-01-27 01:13:50 -08:00
committed by GitHub
parent de4d771d3b 2dc8cadd00
commit e0bba105cc
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go
View File

@@ -140,7 +140,7 @@ func (l *Lifecycle) Admit(ctx context.Context, a admission.Attributes, o admissi
exists = true exists = true
} }
if exists { if exists {
klog.V(4).Infof("found %s in cache after waiting", a.GetNamespace()) klog.V(4).InfoS("Namespace existed in cache after waiting", "namespace", klog.KRef("", a.GetNamespace()))
} }
} }
@@ -161,7 +161,8 @@ func (l *Lifecycle) Admit(ctx context.Context, a admission.Attributes, o admissi
case err != nil: case err != nil:
return errors.NewInternalError(err) return errors.NewInternalError(err)
} }
klog.V(4).Infof("found %s via storage lookup", a.GetNamespace())
klog.V(4).InfoS("Found namespace via storage lookup", "namespace", klog.KRef("", a.GetNamespace()))
} }
// ensure that we're not trying to create objects in terminating namespaces // ensure that we're not trying to create objects in terminating namespaces

4
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go
View File

@@ -377,7 +377,7 @@ func getMatchedLimitedScopes(evaluator quota.Evaluator, inputObject runtime.Obje
for _, limitedResource := range limitedResources { for _, limitedResource := range limitedResources {
matched, err := evaluator.MatchingScopes(inputObject, limitedResource.MatchScopes) matched, err := evaluator.MatchingScopes(inputObject, limitedResource.MatchScopes)
if err != nil { if err != nil {
klog.Errorf("Error while matching limited Scopes: %v", err) klog.ErrorS(err, "Error while matching limited Scopes")
return []corev1.ScopedResourceSelectorRequirement{}, err return []corev1.ScopedResourceSelectorRequirement{}, err
} }
for _, scope := range matched { for _, scope := range matched {
@@ -449,6 +449,8 @@ func CheckRequest(quotas []corev1.ResourceQuota, a admission.Attributes, evaluat
match, err := evaluator.Matches(&resourceQuota, inputObject) match, err := evaluator.Matches(&resourceQuota, inputObject)
if err != nil { if err != nil {
klog.Errorf("Error occurred while matching resource quota, %v, against input object. Err: %v", resourceQuota, err) klog.Errorf("Error occurred while matching resource quota, %v, against input object. Err: %v", resourceQuota, err)
klog.ErrorS(err, "Error occurred while matching resource quota against input object",
"resourceQuota", resourceQuota)
return quotas, err return quotas, err
} }
if !match { if !match {

2
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/object/matcher.go
View File

@@ -36,7 +36,7 @@ func matchObject(obj runtime.Object, selector labels.Selector) bool {
} }
accessor, err := meta.Accessor(obj) accessor, err := meta.Accessor(obj)
if err != nil { if err != nil {
klog.V(5).Infof("cannot access metadata of %v: %v", obj, err) klog.V(5).InfoS("Accessing metadata failed", "object", obj, "err", err)
return false return false
} }
return selector.Matches(labels.Set(accessor.GetLabels())) return selector.Matches(labels.Set(accessor.GetLabels()))

2
staging/src/k8s.io/apiserver/pkg/admission/plugins.go
View File

@@ -81,7 +81,7 @@ func (ps *Plugins) Register(name string, plugin Factory) {
ps.registry = map[string]Factory{} ps.registry = map[string]Factory{}
} }
klog.V(1).Infof("Registered admission plugin %q", name) klog.V(1).InfoS("Registered admission plugin", "plugin", name)
ps.registry[name] = plugin ps.registry[name] = plugin
} }