feat: add add path_handling property to KongIngress

This was added in kong 2.0.
Kong · Mar 20, 2020 · a19f4a0 · a19f4a0
1 parent bec0c00
commit a19f4a0
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 0 deletions.
diff --git a/deploy/manifests/base/custom-types.yaml b/deploy/manifests/base/custom-types.yaml
@@ -228,6 +228,11 @@ spec:
               type: boolean
             preserve_host:
               type: boolean
+            path_handling:
+              type: string
+              enum:
+              - "v0"
+              - "v1"
             protocols:
               type: array
               items:

diff --git a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml
@@ -189,6 +189,11 @@ spec:
               items:
                 type: string
               type: array
+            path_handling:
+              enum:
+              - v0
+              - v1
+              type: string
             preserve_host:
               type: boolean
             protocols:

diff --git a/deploy/single/all-in-one-dbless.yaml b/deploy/single/all-in-one-dbless.yaml
@@ -189,6 +189,11 @@ spec:
               items:
                 type: string
               type: array
+            path_handling:
+              enum:
+              - v0
+              - v1
+              type: string
             preserve_host:
               type: boolean
             protocols:

diff --git a/deploy/single/all-in-one-postgres-enterprise.yaml b/deploy/single/all-in-one-postgres-enterprise.yaml
@@ -189,6 +189,11 @@ spec:
               items:
                 type: string
               type: array
+            path_handling:
+              enum:
+              - v0
+              - v1
+              type: string
             preserve_host:
               type: boolean
             protocols:

diff --git a/deploy/single/all-in-one-postgres.yaml b/deploy/single/all-in-one-postgres.yaml
@@ -189,6 +189,11 @@ spec:
               items:
                 type: string
               type: array
+            path_handling:
+              enum:
+              - v0
+              - v1
+              type: string
             preserve_host:
               type: boolean
             protocols:

diff --git a/hack/dev-env/dev-config.yaml b/hack/dev-env/dev-config.yaml
@@ -234,6 +234,11 @@ spec:
               type: boolean
             preserve_host:
               type: boolean
+            path_handling:
+              type: string
+              enum:
+              - "v0"
+              - "v1"
             protocols:
               type: array
               items:

diff --git a/internal/ingress/controller/kong.go b/internal/ingress/controller/kong.go
@@ -345,6 +345,11 @@ func (n *KongController) fillRoute(route *kong.Route) {
 			route.HTTPSRedirectStatusCode = kong.Int(426)
 		}
 	}
+	if n.cfg.Kong.Version.GTE(kong200version) {
+		if route.PathHandling == nil {
+			route.PathHandling = kong.String("v0")
+		}
+	}
 }
 
 func (n *KongController) fillUpstream(upstream *kong.Upstream) {

diff --git a/internal/ingress/controller/parser/parser.go b/internal/ingress/controller/parser/parser.go
@@ -961,6 +961,9 @@ func overrideRouteByKongIngress(route *Route,
 	if r.HTTPSRedirectStatusCode != nil {
 		route.HTTPSRedirectStatusCode = kong.Int(*r.HTTPSRedirectStatusCode)
 	}
+	if r.PathHandling != nil {
+		route.PathHandling = kong.String(*r.PathHandling)
+	}
 }
 
 // normalizeProtocols prevents users from mismatching grpc/http

diff --git a/internal/ingress/controller/parser/parser_test.go b/internal/ingress/controller/parser/parser_test.go
@@ -2635,6 +2635,24 @@ func TestOverrideRoute(t *testing.T) {
 				},
 			},
 		},
+		{
+			Route{
+				Route: kong.Route{
+					Hosts: kong.StringSlice("foo.com"),
+				},
+			},
+			configurationv1.KongIngress{
+				Route: &kong.Route{
+					PathHandling: kong.String("v1"),
+				},
+			},
+			Route{
+				Route: kong.Route{
+					Hosts:        kong.StringSlice("foo.com"),
+					PathHandling: kong.String("v1"),
+				},
+			},
+		},
 	}
 
 	for _, testcase := range testTable {