homelab/traefik
1
0
Fork 0
Code Activity

feat(consulcatalog): add WhitelistSourceRange tags.

Browse source
This commit is contained in:
Fernandez Ludovic 2018-01-01 03:37:24 +01:00 • committed by Traefiker
parent 2fdefa258e
commit c9b871a03a
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
provider/consul/consul_catalog_config.go
View file

@ -46,6 +46,7 @@ func (p *CatalogProvider) buildConfiguration(catalog []catalogUpdate) *types.Con
"getPriority": p.getFuncIntAttribute(label.SuffixFrontendPriority, 0), "getPriority": p.getFuncIntAttribute(label.SuffixFrontendPriority, 0),
"getPassHostHeader": p.getFuncBoolAttribute(label.SuffixFrontendPassHostHeader, true), "getPassHostHeader": p.getFuncBoolAttribute(label.SuffixFrontendPassHostHeader, true),
"getPassTLSCert": p.getFuncBoolAttribute(label.SuffixFrontendPassTLSCert, label.DefaultPassTLSCert), "getPassTLSCert": p.getFuncBoolAttribute(label.SuffixFrontendPassTLSCert, label.DefaultPassTLSCert),
"getWhitelistSourceRange": p.getFuncSliceAttribute(label.SuffixFrontendWhitelistSourceRange),
} }
var allNodes []*api.ServiceEntry var allNodes []*api.ServiceEntry

7
templates/consul_catalog.tmpl
View file

@ -48,6 +48,13 @@
"{{.}}", "{{.}}",
{{end}}] {{end}}]
{{ $whitelistSourceRange := getWhitelistSourceRange $service.Attributes }}
{{if $whitelistSourceRange }}
whitelistSourceRange = [{{range $whitelistSourceRange}}
"{{.}}",
{{end}}]
{{end}}
basicAuth = [{{range getBasicAuth $service.Attributes }} basicAuth = [{{range getBasicAuth $service.Attributes }}
"{{.}}", "{{.}}",
{{end}}] {{end}}]