Skip to content

Commit 2631039

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#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 ```
2 parents 9f78ee5 + 185d5c1 commit 2631039

File tree

1 file changed

+3
-4
lines changed
  • staging/src/k8s.io/apiserver/pkg/admission

1 file changed

+3
-4
lines changed

staging/src/k8s.io/apiserver/pkg/admission/config.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package admission
1818

1919
import (
20+
"bytes"
2021
"fmt"
2122
"io"
2223
"io/ioutil"
@@ -27,8 +28,6 @@ import (
2728
"github.com/ghodss/yaml"
2829
"github.com/golang/glog"
2930

30-
"bytes"
31-
3231
"k8s.io/apimachinery/pkg/runtime"
3332
"k8s.io/apimachinery/pkg/runtime/schema"
3433
"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -151,8 +150,8 @@ func GetAdmissionPluginConfigurationFor(pluginCfg apiserver.AdmissionPluginConfi
151150
return nil, nil
152151
}
153152

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

0 commit comments

Comments
 (0)