Merge pull request #44797 from FengyunPan/fix-logProviders

Automatic merge from submit-queue (batch tested with PRs 44741, 44853, 44572, 44797, 44439) Check errors before logging providers The logProviders() should check errors firstly, and do not log providers when providers is null.

Merge pull request #44797 from FengyunPan/fix-logProviders
8488c939 · Kubernetes Submit Queue · GitHub · 9dde8ec6 · 3856b5d7 · 8488c939
Commit 8488c939 authored Apr 25, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

admission.go plugin/pkg/admission/security/podsecuritypolicy/admission.go +10 -5

No files found.
--- a/plugin/pkg/admission/security/podsecuritypolicy/admission.go
+++ b/plugin/pkg/admission/security/podsecuritypolicy/admission.go
@@ -327,13 +327,18 @@ func buildAttributes(info user.Info, namespace string, policy *extensions.PodSec
 // logProviders logs what providers were found for the pod as well as any errors that were encountered
 // while creating providers.
 func logProviders(pod *api.Pod, providers []psp.Provider, providerCreationErrs []error) {
+	for _, err := range providerCreationErrs {
+		glog.V(4).Infof("provider creation error: %v", err)
+	}
+
+	if len(providers) == 0 {
+		glog.V(4).Infof("unable to validate pod %s (generate: %s) against any provider.", pod.Name, pod.GenerateName)
+		return
+	}
+
 	names := make([]string, len(providers))
 	for i, p := range providers {
 		names[i] = p.GetPSPName()
 	}
-	glog.V(4).Infof("validating pod %s (generate: %s) against providers %s", pod.Name, pod.GenerateName, strings.Join(names, ","))
-
-	for _, err := range providerCreationErrs {
-		glog.V(4).Infof("provider creation error: %v", err)
-	}
+	glog.V(4).Infof("validating pod %s (generate: %s) against providers: %s", pod.Name, pod.GenerateName, strings.Join(names, ","))
 }