From bdfc2e1a0d1d815c72c24365140fe2d160ee4014 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 21 Dec 2016 15:19:50 -0500 Subject: [PATCH] Resolve relative admission plugin config file locations --- pkg/cmd/server/api/helpers.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/cmd/server/api/helpers.go b/pkg/cmd/server/api/helpers.go index be7790f4d075..9e9224081b19 100644 --- a/pkg/cmd/server/api/helpers.go +++ b/pkg/cmd/server/api/helpers.go @@ -235,6 +235,10 @@ func GetMasterFileReferences(config *MasterConfig) []*string { } } + for k := range config.AdmissionConfig.PluginConfig { + refs = append(refs, &config.AdmissionConfig.PluginConfig[k].Location) + } + if config.KubernetesMasterConfig != nil { refs = append(refs, &config.KubernetesMasterConfig.SchedulerConfigFile) @@ -244,6 +248,10 @@ func GetMasterFileReferences(config *MasterConfig) []*string { refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.APIServerArguments) refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.SchedulerArguments) refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.ControllerArguments) + + for k := range config.KubernetesMasterConfig.AdmissionConfig.PluginConfig { + refs = append(refs, &config.KubernetesMasterConfig.AdmissionConfig.PluginConfig[k].Location) + } } if config.AuthConfig.RequestHeader != nil {