Set RuleSyntax "v3" for dynamic.Router explicitly

traefik · May 4, 2024 · 8108e61 · 8108e61
1 parent aee515b
commit 8108e61
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 118 deletions.
diff --git a/integration/testdata/rawdata-ingress-label-selector.json b/integration/testdata/rawdata-ingress-label-selector.json
@@ -34,6 +34,7 @@
 			],
 			"service": "default-whoami-http",
 			"rule": "Host(`whoami.test`) \u0026\u0026 PathPrefix(`/whoami`)",
+			"ruleSyntax": "v3",
 			"priority": 44,
 			"status": "enabled",
 			"using": [

diff --git a/integration/testdata/rawdata-ingress.json b/integration/testdata/rawdata-ingress.json
@@ -34,6 +34,7 @@
 			],
 			"service": "default-whoami-http",
 			"rule": "Host(`whoami.test.https`) \u0026\u0026 PathPrefix(`/whoami`)",
+			"ruleSyntax": "v3",
 			"priority": 50,
 			"status": "enabled",
 			"using": [
@@ -46,6 +47,7 @@
 			],
 			"service": "default-whoami-http",
 			"rule": "Host(`whoami.test`) \u0026\u0026 PathPrefix(`/whoami`)",
+			"ruleSyntax": "v3",
 			"priority": 44,
 			"status": "enabled",
 			"using": [
@@ -58,6 +60,7 @@
 			],
 			"service": "default-whoami-80",
 			"rule": "Host(`whoami.test.drop`) \u0026\u0026 PathPrefix(`/drop`)",
+			"ruleSyntax": "v3",
 			"priority": 47,
 			"status": "enabled",
 			"using": [
@@ -70,6 +73,7 @@
 			],
 			"service": "default-whoami-80",
 			"rule": "Host(`whoami.test.keep`) \u0026\u0026 PathPrefix(`/keep`)",
+			"ruleSyntax": "v3",
 			"priority": 47,
 			"status": "enabled",
 			"using": [

diff --git a/integration/testdata/rawdata-ingressclass.json b/integration/testdata/rawdata-ingressclass.json
@@ -34,6 +34,7 @@
 			],
 			"service": "default-whoami-80",
 			"rule": "Host(`whoami.test.keep`) \u0026\u0026 PathPrefix(`/keep`)",
+			"ruleSyntax": "v3",
 			"priority": 47,
 			"status": "enabled",
 			"using": [

diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go
@@ -277,9 +277,10 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
 			}
 
 			rt := &dynamic.Router{
-				Rule:     "PathPrefix(`/`)",
-				Priority: math.MinInt32,
-				Service:  "default-backend",
+				Rule:       "PathPrefix(`/`)",
+				RuleSyntax: "v3",
+				Priority:   math.MinInt32,
+				Service:    "default-backend",
 			}
 
 			if rtConfig != nil && rtConfig.Router != nil {
@@ -708,8 +709,9 @@ func loadRouter(rule netv1.IngressRule, pa netv1.HTTPIngressPath, rtConfig *Rout
 	}
 
 	rt := &dynamic.Router{
-		Rule:    strings.Join(rules, " && "),
-		Service: serviceName,
+		Rule:       strings.Join(rules, " && "),
+		RuleSyntax: "v3",
+		Service:    serviceName,
 	}
 
 	if rtConfig != nil && rtConfig.Router != nil {