github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix loading structured admission plugin config

Browse Source
This commit is contained in:
Jordan Liggitt 2018-01-18 02:32:28 -05:00
parent ed53e8a25c
commit 34328ea87d
No known key found for this signature in database
GPG Key ID: 39928704103C7229
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/server/options/admission.go
View File

@ -38,11 +38,11 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
) )
var scheme = runtime.NewScheme() var configScheme = runtime.NewScheme()
func init() { func init() {
apiserverapi.AddToScheme(scheme) apiserverapi.AddToScheme(configScheme)
apiserverapiv1alpha1.AddToScheme(scheme) apiserverapiv1alpha1.AddToScheme(configScheme)
} }
// AdmissionOptions holds the admission options // AdmissionOptions holds the admission options
@ -125,7 +125,7 @@ func (a *AdmissionOptions) ApplyTo(
pluginNames = a.enabledPluginNames() pluginNames = a.enabledPluginNames()
} }
pluginsConfigProvider, err := admission.ReadAdmissionConfiguration(pluginNames, a.ConfigFile, scheme) pluginsConfigProvider, err := admission.ReadAdmissionConfiguration(pluginNames, a.ConfigFile, configScheme)
if err != nil { if err != nil {
return fmt.Errorf("failed to read plugin config: %v", err) return fmt.Errorf("failed to read plugin config: %v", err)
} }