Resolve relative admission plugin config file locations

liggitt · liggitt · commit bdfc2e1a0d1d · 2018-01-12T22:05:59.000-05:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,10 @@ func GetMasterFileReferences(config MasterConfig) []string {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
	`238`	`+ for k := range config.AdmissionConfig.PluginConfig {`
	`239`	`+ refs = append(refs, &config.AdmissionConfig.PluginConfig[k].Location)`
	`240`	`+ }`
	`241`	`+`
`238`	`242`	`if config.KubernetesMasterConfig != nil {`
`239`	`243`	`refs = append(refs, &config.KubernetesMasterConfig.SchedulerConfigFile)`
`240`	`244`
`@@ -244,6 +248,10 @@ func GetMasterFileReferences(config MasterConfig) []string {`
`244`	`248`	`refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.APIServerArguments)`
`245`	`249`	`refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.SchedulerArguments)`
`246`	`250`	`refs = appendFlagsWithFileExtensions(refs, config.KubernetesMasterConfig.ControllerArguments)`
	`251`	`+`
	`252`	`+ for k := range config.KubernetesMasterConfig.AdmissionConfig.PluginConfig {`
	`253`	`+ refs = append(refs, &config.KubernetesMasterConfig.AdmissionConfig.PluginConfig[k].Location)`
	`254`	`+ }`
`247`	`255`	`}`
`248`	`256`
`249`	`257`	`if config.AuthConfig.RequestHeader != nil {`