Skip to content

Commit

Permalink
Resolve relative admission plugin config file locations
Browse files Browse the repository at this point in the history
  • Loading branch information
liggitt committed Jan 13, 2018
1 parent 73c3201 commit bdfc2e1
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkg/cmd/server/api/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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 {
Expand Down

0 comments on commit bdfc2e1

Please sign in to comment.