-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for header-based filtering on TrafficTargets
- Loading branch information
Showing
12 changed files
with
299 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
pkg/provider/testdata/acl-enabled-http-route-group-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| { | ||
| "http": { | ||
| "routers": { | ||
| "my-ns-svc-b-8080": { | ||
| "entryPoints": [ | ||
| "http-10000" | ||
| ], | ||
| "middlewares": [ | ||
| "block-all-middleware" | ||
| ], | ||
| "service": "block-all-service", | ||
| "rule": "Host(`svc-b.my-ns.maesh`) || Host(`10.10.14.1`)", | ||
| "priority": 1 | ||
| }, | ||
| "my-ns-svc-b-tt-8080-traffic-target-direct": { | ||
| "entryPoints": [ | ||
| "http-10000" | ||
| ], | ||
| "middlewares": [ | ||
| "my-ns-svc-b-tt-whitelist-traffic-target-direct" | ||
| ], | ||
| "service": "my-ns-svc-b-tt-8080-traffic-target", | ||
| "rule": "(Host(`svc-b.my-ns.maesh`) || Host(`10.10.14.1`)) && (PathPrefix(`/{path:app}`) || (PathPrefix(`/{path:api/notifications}`) && Method(`GET`)) || HeadersRegexp(`User-Agent`, `Mozilla/.*`))", | ||
| "priority": 2005 | ||
| }, | ||
| "readiness": { | ||
| "entryPoints": [ | ||
| "readiness" | ||
| ], | ||
| "service": "readiness", | ||
| "rule": "Path(`/ping`)" | ||
| } | ||
| }, | ||
| "services": { | ||
| "block-all-service": { | ||
| "loadBalancer": { | ||
| "passHostHeader": false | ||
| } | ||
| }, | ||
| "my-ns-svc-b-tt-8080-traffic-target": { | ||
| "loadBalancer": { | ||
| "servers": [ | ||
| { | ||
| "url": "http://10.10.3.1:8080" | ||
| } | ||
| ], | ||
| "passHostHeader": true | ||
| } | ||
| }, | ||
| "readiness": { | ||
| "loadBalancer": { | ||
| "servers": [ | ||
| { | ||
| "url": "http://127.0.0.1:8080" | ||
| } | ||
| ], | ||
| "passHostHeader": true | ||
| } | ||
| } | ||
| }, | ||
| "middlewares": { | ||
| "block-all-middleware": { | ||
| "ipWhiteList": { | ||
| "sourceRange": [ | ||
| "255.255.255.255" | ||
| ] | ||
| } | ||
| }, | ||
| "my-ns-svc-b-tt-whitelist-traffic-target-direct": { | ||
| "ipWhiteList": { | ||
| "sourceRange": [ | ||
| "10.10.2.1" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
153 changes: 153 additions & 0 deletions
153
pkg/provider/testdata/acl-enabled-http-route-group-topology.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| { | ||
| "services": { | ||
| "svc-b@my-ns": { | ||
| "name": "svc-b", | ||
| "namespace": "my-ns", | ||
| "selector": {}, | ||
| "annotations": {}, | ||
| "ports": [ | ||
| { | ||
| "name": "port-8080", | ||
| "protocol": "TCP", | ||
| "port": 8080, | ||
| "targetPort": 8080 | ||
| } | ||
| ], | ||
| "clusterIp": "10.10.14.1", | ||
| "pods": [ | ||
| "pod-b@my-ns" | ||
| ], | ||
| "trafficTargets": [ | ||
| "svc-b@my-ns:tt@my-ns" | ||
| ] | ||
| } | ||
| }, | ||
| "pods": { | ||
| "pod-a@my-ns": { | ||
| "name": "pod-a", | ||
| "namespace": "my-ns", | ||
| "serviceAccount": "client", | ||
| "ip": "10.10.2.1" | ||
| }, | ||
| "pod-b@my-ns": { | ||
| "name": "pod-b", | ||
| "namespace": "my-ns", | ||
| "serviceAccount": "server", | ||
| "ip": "10.10.3.1", | ||
| "containerPorts": [ | ||
| { | ||
| "name": "web", | ||
| "protocol": "TCP", | ||
| "containerPort": 8081 | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "serviceTrafficTargets": { | ||
| "svc-b@my-ns:tt@my-ns": { | ||
| "service": "svc-b@my-ns", | ||
| "name": "tt", | ||
| "namespace": "my-ns", | ||
| "sources": [ | ||
| { | ||
| "serviceAccount": "client", | ||
| "namespace": "my-ns", | ||
| "pods": [ | ||
| "pod-a@my-ns" | ||
| ] | ||
| } | ||
| ], | ||
| "destination": { | ||
| "serviceAccount": "server", | ||
| "namespace": "my-ns", | ||
| "ports": [ | ||
| { | ||
| "name": "port-8080", | ||
| "protocol": "TCP", | ||
| "port": 8080, | ||
| "targetPort": 8080 | ||
| } | ||
| ], | ||
| "pods": [ | ||
| "pod-b@my-ns" | ||
| ] | ||
| }, | ||
| "rules": [ | ||
| { | ||
| "httpRouteGroup": { | ||
| "kind": "HTTPRouteGroup", | ||
| "apiVersion": "specs.smi-spec.io/v1alpha3", | ||
| "metadata": { | ||
| "name": "app-route-group", | ||
| "namespace": "my-ns" | ||
| }, | ||
| "spec": { | ||
| "matches": [ | ||
| { | ||
| "name": "app", | ||
| "methods": ["*"], | ||
| "pathRegex": "/app" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "httpMatches": [ | ||
| { | ||
| "name": "app", | ||
| "methods": ["*"], | ||
| "pathRegex": "/app" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "httpRouteGroup": { | ||
| "kind": "HTTPRouteGroup", | ||
| "apiVersion": "specs.smi-spec.io/v1alpha3", | ||
| "metadata": { | ||
| "name": "app-route-group", | ||
| "namespace": "my-ns" | ||
| }, | ||
| "spec": { | ||
| "matches": [ | ||
| { | ||
| "name": "users", | ||
| "methods": ["GET", "POST", "PUT"], | ||
| "pathRegex": "/api/users" | ||
| }, | ||
| { | ||
| "name": "notifications", | ||
| "methods": ["GET"], | ||
| "pathRegex": "/api/notifications" | ||
| }, | ||
| { | ||
| "name": "firefox-beta", | ||
| "headers": [ | ||
| { | ||
| "User-Agent": "Mozilla/.*" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "httpMatches": [ | ||
| { | ||
| "name": "notifications", | ||
| "methods": ["GET"], | ||
| "pathRegex": "/api/notifications" | ||
| }, | ||
| { | ||
| "name": "firefox-beta", | ||
| "headers": [ | ||
| { | ||
| "User-Agent": "Mozilla/.*" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "trafficSplits": {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.