Merge pull request #55296 from hzxuzhonghu/fix-1

Automatic merge from submit-queue (batch tested with PRs 56161, 56324, 55685, 56409, 55296). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix typo **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55296 from hzxuzhonghu/fix-1
2631039e · Kubernetes Submit Queue · GitHub · 9f78ee56 · 185d5c1f · 2631039e
Unverified Commit 2631039e authored Dec 15, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

config.go staging/src/k8s.io/apiserver/pkg/admission/config.go +3 -4

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/admission/config.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/config.go
@@ -17,6 +17,7 @@ limitations under the License.
 package admission

 import (
+	"bytes"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -27,8 +28,6 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"

-	"bytes"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -151,8 +150,8 @@ func GetAdmissionPluginConfigurationFor(pluginCfg apiserver.AdmissionPluginConfi
 	return nil, nil
 }

-// GetAdmissionPluginConfiguration takes the admission configuration and returns a reader
-// for the specified plugin.  If no specific configuration is present, we return a nil reader.
+// ConfigFor returns a reader for the specified plugin.
+// If no specific configuration is present, we return a nil reader.
 func (p configProvider) ConfigFor(pluginName string) (io.Reader, error) {
 	// there is no config, so there is no potential config
 	if p.config == nil {