Fix loading structured admission plugin config

parent ed53e8a2
...@@ -38,11 +38,11 @@ import ( ...@@ -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( ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment