Fix rule syntax version for all internal routers

integration/testdata/rawdata-consul.json

@@ -53,6 +53,7 @@
       ],
       "service": "api@internal",
       "rule": "PathPrefix(`/api`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775806,
       "status": "enabled",
       "using": [
@@ -69,6 +70,7 @@
       ],
       "service": "dashboard@internal",
       "rule": "PathPrefix(`/`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775805,
       "status": "enabled",
       "using": [

integration/testdata/rawdata-etcd.json

@@ -53,6 +53,7 @@
       ],
       "service": "api@internal",
       "rule": "PathPrefix(`/api`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775806,
       "status": "enabled",
       "using": [
@@ -69,6 +70,7 @@
       ],
       "service": "dashboard@internal",
       "rule": "PathPrefix(`/`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775805,
       "status": "enabled",
       "using": [

integration/testdata/rawdata-gateway.json

@@ -6,6 +6,7 @@
 			],
 			"service": "api@internal",
 			"rule": "PathPrefix(`/api`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775806,
 			"status": "enabled",
 			"using": [
@@ -22,6 +23,7 @@
 			],
 			"service": "dashboard@internal",
 			"rule": "PathPrefix(`/`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775805,
 			"status": "enabled",
 			"using": [

integration/testdata/rawdata-ingress-label-selector.json

@@ -6,6 +6,7 @@
 			],
 			"service": "api@internal",
 			"rule": "PathPrefix(`/api`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775806,
 			"status": "enabled",
 			"using": [
@@ -22,6 +23,7 @@
 			],
 			"service": "dashboard@internal",
 			"rule": "PathPrefix(`/`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775805,
 			"status": "enabled",
 			"using": [

integration/testdata/rawdata-ingress.json

@@ -6,6 +6,7 @@
 			],
 			"service": "api@internal",
 			"rule": "PathPrefix(`/api`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775806,
 			"status": "enabled",
 			"using": [
@@ -22,6 +23,7 @@
 			],
 			"service": "dashboard@internal",
 			"rule": "PathPrefix(`/`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775805,
 			"status": "enabled",
 			"using": [

integration/testdata/rawdata-ingressclass-disabled.json

@@ -6,6 +6,7 @@
 			],
 			"service": "api@internal",
 			"rule": "PathPrefix(`/api`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775806,
 			"status": "enabled",
 			"using": [
@@ -22,6 +23,7 @@
 			],
 			"service": "dashboard@internal",
 			"rule": "PathPrefix(`/`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775805,
 			"status": "enabled",
 			"using": [

integration/testdata/rawdata-ingressclass.json

@@ -6,6 +6,7 @@
 			],
 			"service": "api@internal",
 			"rule": "PathPrefix(`/api`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775806,
 			"status": "enabled",
 			"using": [
@@ -22,6 +23,7 @@
 			],
 			"service": "dashboard@internal",
 			"rule": "PathPrefix(`/`)",
+			"ruleSyntax": "v3",
 			"priority": 9223372036854775805,
 			"status": "enabled",
 			"using": [

integration/testdata/rawdata-redis.json

@@ -53,6 +53,7 @@
       ],
       "service": "api@internal",
       "rule": "PathPrefix(`/api`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775806,
       "status": "enabled",
       "using": [
@@ -69,6 +70,7 @@
       ],
       "service": "dashboard@internal",
       "rule": "PathPrefix(`/`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775805,
       "status": "enabled",
       "using": [

integration/testdata/rawdata-zk.json

@@ -53,6 +53,7 @@
       ],
       "service": "api@internal",
       "rule": "PathPrefix(`/api`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775806,
       "status": "enabled",
       "using": [
@@ -69,6 +70,7 @@
       ],
       "service": "dashboard@internal",
       "rule": "PathPrefix(`/`)",
+      "ruleSyntax": "v3",
       "priority": 9223372036854775805,
       "status": "enabled",
       "using": [

pkg/provider/kubernetes/ingress/kubernetes.go

@@ -277,9 +277,10 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
 			}
 
 			rt := &dynamic.Router{
-				Rule:     "PathPrefix(`/`)",
+				Rule:       "PathPrefix(`/`)",
-				Priority: math.MinInt32,
+				RuleSyntax: "v3",
-				Service:  "default-backend",
+				Priority:   math.MinInt32,
+				Service:    "default-backend",
 			}
 
 			if rtConfig != nil && rtConfig.Router != nil {

pkg/provider/kubernetes/ingress/kubernetes_test.go

@@ -528,9 +528,10 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
 					Middlewares: map[string]*dynamic.Middleware{},
 					Routers: map[string]*dynamic.Router{
 						"default-router": {
-							Rule:     "PathPrefix(`/`)",
+							Rule:       "PathPrefix(`/`)",
-							Service:  "default-backend",
+							RuleSyntax: "v3",
-							Priority: math.MinInt32,
+							Service:    "default-backend",
+							Priority:   math.MinInt32,
 						},
 					},
 					Services: map[string]*dynamic.Service{
@@ -993,9 +994,10 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
 					Middlewares: map[string]*dynamic.Middleware{},
 					Routers: map[string]*dynamic.Router{
 						"default-router": {
-							Rule:     "PathPrefix(`/`)",
+							Rule:       "PathPrefix(`/`)",
-							Service:  "default-backend",
+							RuleSyntax: "v3",
-							Priority: math.MinInt32,
+							Service:    "default-backend",
+							Priority:   math.MinInt32,
 						},
 					},
 					Services: map[string]*dynamic.Service{
@@ -1469,9 +1471,10 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
 					Middlewares: map[string]*dynamic.Middleware{},
 					Routers: map[string]*dynamic.Router{
 						"default-router": {
-							Rule:     "PathPrefix(`/`)",
+							Rule:       "PathPrefix(`/`)",
-							Priority: math.MinInt32,
+							RuleSyntax: "v3",
-							Service:  "default-backend",
+							Priority:   math.MinInt32,
+							Service:    "default-backend",
 						},
 					},
 					Services: map[string]*dynamic.Service{

pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json

@@ -7,6 +7,7 @@
         ],
         "service": "api@internal",
         "rule": "PathPrefix(`/api`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775806
       },
       "dashboard": {
@@ -19,6 +20,7 @@
         ],
         "service": "dashboard@internal",
         "rule": "PathPrefix(`/`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775805
       }
     },

pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json

@@ -7,6 +7,7 @@
         ],
         "service": "api@internal",
         "rule": "PathPrefix(`/api`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775806
       }
     },

pkg/provider/traefik/fixtures/full_configuration.json

@@ -7,6 +7,7 @@
         ],
         "service": "api@internal",
         "rule": "PathPrefix(`/api`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775806
       },
       "dashboard": {
@@ -19,6 +20,7 @@
         ],
         "service": "dashboard@internal",
         "rule": "PathPrefix(`/`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775805
       },
       "debug": {
@@ -27,6 +29,7 @@
         ],
         "service": "api@internal",
         "rule": "PathPrefix(`/debug`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775806
       },
       "ping": {
@@ -35,6 +38,7 @@
         ],
         "service": "ping@internal",
         "rule": "PathPrefix(`/ping`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       },
       "prometheus": {
@@ -43,6 +47,7 @@
         ],
         "service": "prometheus@internal",
         "rule": "PathPrefix(`/metrics`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       },
       "rest": {
@@ -51,6 +56,7 @@
         ],
         "service": "rest@internal",
         "rule": "PathPrefix(`/api/providers`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       }
     },

pkg/provider/traefik/fixtures/ping_simple.json

@@ -7,6 +7,7 @@
         ],
         "service": "ping@internal",
         "rule": "PathPrefix(`/ping`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       }
     },

pkg/provider/traefik/fixtures/prometheus_simple.json

@@ -7,6 +7,7 @@
         ],
         "service": "prometheus@internal",
         "rule": "PathPrefix(`/metrics`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       }
     },

pkg/provider/traefik/fixtures/redirection.json

@@ -9,7 +9,8 @@
           "redirect-web-to-websecure"
         ],
         "service": "noop@internal",
-        "rule": "HostRegexp(`^.+$`)"
+        "rule": "HostRegexp(`^.+$`)",
+        "ruleSyntax": "v3"
       }
     },
     "services": {

pkg/provider/traefik/fixtures/redirection_port.json

@@ -9,7 +9,8 @@
           "redirect-web-to-443"
         ],
         "service": "noop@internal",
-        "rule": "HostRegexp(`^.+$`)"
+        "rule": "HostRegexp(`^.+$`)",
+        "ruleSyntax": "v3"
       }
     },
     "services": {

pkg/provider/traefik/fixtures/redirection_with_protocol.json

@@ -9,7 +9,8 @@
           "redirect-web-to-websecure"
         ],
         "service": "noop@internal",
-        "rule": "HostRegexp(`^.+$`)"
+        "rule": "HostRegexp(`^.+$`)",
+        "ruleSyntax": "v3"
       }
     },
     "services": {

pkg/provider/traefik/fixtures/rest_insecure.json

@@ -7,6 +7,7 @@
         ],
         "service": "rest@internal",
         "rule": "PathPrefix(`/api/providers`)",
+        "ruleSyntax": "v3",
         "priority": 9223372036854775807
       }
     },

pkg/provider/traefik/internal.go

@@ -106,6 +106,7 @@ func (i *Provider) acme(cfg *dynamic.Configuration) {
 	if len(eps) > 0 {
 		rt := &dynamic.Router{
 			Rule:        "PathPrefix(`/.well-known/acme-challenge/`)",
+			RuleSyntax:  "v3",
 			EntryPoints: eps,
 			Service:     "acme-http@internal",
 			Priority:    math.MaxInt,
@@ -141,6 +142,7 @@ func (i *Provider) redirection(ctx context.Context, cfg *dynamic.Configuration)
 
 		rt := &dynamic.Router{
 			Rule:        "HostRegexp(`^.+$`)",
+			RuleSyntax:  "v3",
 			EntryPoints: []string{name},
 			Middlewares: []string{mdName},
 			Service:     "noop@internal",
@@ -241,6 +243,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
 			Service:     "api@internal",
 			Priority:    math.MaxInt - 1,
 			Rule:        "PathPrefix(`/api`)",
+			RuleSyntax:  "v3",
 		}
 
 		if i.staticCfg.API.Dashboard {
@@ -249,6 +252,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
 				Service:     "dashboard@internal",
 				Priority:    math.MaxInt - 2,
 				Rule:        "PathPrefix(`/`)",
+				RuleSyntax:  "v3",
 				Middlewares: []string{"dashboard_redirect@internal", "dashboard_stripprefix@internal"},
 			}
 
@@ -270,6 +274,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) {
 				Service:     "api@internal",
 				Priority:    math.MaxInt - 1,
 				Rule:        "PathPrefix(`/debug`)",
+				RuleSyntax:  "v3",
 			}
 		}
 	}
@@ -292,6 +297,7 @@ func (i *Provider) pingConfiguration(cfg *dynamic.Configuration) {
 			Service:     "ping@internal",
 			Priority:    math.MaxInt,
 			Rule:        "PathPrefix(`/ping`)",
+			RuleSyntax:  "v3",
 		}
 	}
 
@@ -309,6 +315,7 @@ func (i *Provider) restConfiguration(cfg *dynamic.Configuration) {
 			Service:     "rest@internal",
 			Priority:    math.MaxInt,
 			Rule:        "PathPrefix(`/api/providers`)",
+			RuleSyntax:  "v3",
 		}
 	}
 
@@ -326,6 +333,7 @@ func (i *Provider) prometheusConfiguration(cfg *dynamic.Configuration) {
 			Service:     "prometheus@internal",
 			Priority:    math.MaxInt,
 			Rule:        "PathPrefix(`/metrics`)",
+			RuleSyntax:  "v3",
 		}
 	}