kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
```

Kubernetes-commit: 2631039e9fb076c3034b243617810da26b6e6f6a
This commit is contained in:
Kubernetes Publisher 2017-12-15 04:33:49 -08:00
parent b77e344208 2d197ca9f2
commit cbbf2be019
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Godeps/Godeps.json generated
View File

@ -764,119 +764,119 @@
},
{
"ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "400667919eb044f6806d3171d7f0393961d38e15"
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",

7
pkg/admission/config.go
View File

@ -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 {