Merge pull request #510 from vdemeester/remove-frontend-value-docker
Remove traefik.frontend.value support in docker…
This commit is contained in:
commit
d1112a0feb
4 changed files with 0 additions and 29 deletions
|
@ -238,15 +238,6 @@ func (provider *Docker) getFrontendName(container dockertypes.ContainerJSON) str
|
||||||
// GetFrontendRule returns the frontend rule for the specified container, using
|
// GetFrontendRule returns the frontend rule for the specified container, using
|
||||||
// it's label. It returns a default one (Host) if the label is not present.
|
// it's label. It returns a default one (Host) if the label is not present.
|
||||||
func (provider *Docker) getFrontendRule(container dockertypes.ContainerJSON) string {
|
func (provider *Docker) getFrontendRule(container dockertypes.ContainerJSON) string {
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
// TODO: backwards compatibility with DEPRECATED rule.Value
|
|
||||||
if value, ok := container.Config.Labels["traefik.frontend.value"]; ok {
|
|
||||||
log.Warnf("Label traefik.frontend.value=%s is DEPRECATED (will be removed in v1.0.0), please refer to the rule label: https://github.com/containous/traefik/blob/master/docs/index.md#docker", value)
|
|
||||||
rule, _ := container.Config.Labels["traefik.frontend.rule"]
|
|
||||||
return rule + ":" + value
|
|
||||||
}
|
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
|
|
||||||
if label, err := getLabel(container, "traefik.frontend.rule"); err == nil {
|
if label, err := getLabel(container, "traefik.frontend.rule"); err == nil {
|
||||||
return label
|
return label
|
||||||
}
|
}
|
||||||
|
|
|
@ -344,14 +344,6 @@ func (provider *Marathon) getEntryPoints(application marathon.Application) []str
|
||||||
// getFrontendRule returns the frontend rule for the specified application, using
|
// getFrontendRule returns the frontend rule for the specified application, using
|
||||||
// it's label. It returns a default one (Host) if the label is not present.
|
// it's label. It returns a default one (Host) if the label is not present.
|
||||||
func (provider *Marathon) getFrontendRule(application marathon.Application) string {
|
func (provider *Marathon) getFrontendRule(application marathon.Application) string {
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
// TODO: backwards compatibility with DEPRECATED rule.Value
|
|
||||||
if value, err := provider.getLabel(application, "traefik.frontend.value"); err == nil {
|
|
||||||
log.Warnf("Label traefik.frontend.value=%s is DEPRECATED, please refer to the rule label: https://github.com/containous/traefik/blob/master/docs/index.md#marathon", value)
|
|
||||||
rule, _ := provider.getLabel(application, "traefik.frontend.rule")
|
|
||||||
return rule + ":" + value
|
|
||||||
}
|
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil {
|
if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil {
|
||||||
return label
|
return label
|
||||||
}
|
}
|
||||||
|
|
|
@ -605,14 +605,6 @@ func (server *Server) buildDefaultHTTPRouter() *mux.Router {
|
||||||
}
|
}
|
||||||
|
|
||||||
func getRoute(serverRoute *serverRoute, route *types.Route) error {
|
func getRoute(serverRoute *serverRoute, route *types.Route) error {
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
// TODO: backwards compatibility with DEPRECATED rule.Value
|
|
||||||
if len(route.Value) > 0 {
|
|
||||||
route.Rule += ":" + route.Value
|
|
||||||
log.Warnf("Value %s is DEPRECATED (will be removed in v1.0.0), please refer to the new frontend notation: https://github.com/containous/traefik/blob/master/docs/index.md#-frontends", route.Value)
|
|
||||||
}
|
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
|
|
||||||
rules := Rules{route: serverRoute}
|
rules := Rules{route: serverRoute}
|
||||||
newRoute, err := rules.Parse(route.Rule)
|
newRoute, err := rules.Parse(route.Rule)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -40,10 +40,6 @@ type Server struct {
|
||||||
// Route holds route configuration.
|
// Route holds route configuration.
|
||||||
type Route struct {
|
type Route struct {
|
||||||
Rule string `json:"rule,omitempty"`
|
Rule string `json:"rule,omitempty"`
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
// TODO: backwards compatibility with DEPRECATED rule.Value
|
|
||||||
Value string `json:"value,omitempty"`
|
|
||||||
// ⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Frontend holds frontend configuration.
|
// Frontend holds frontend configuration.
|
||||||
|
|
Loading…
Reference in a new issue