Skip to content

Commit 01c9944

Browse files
committed
Remove trailing slash for yarn proxy rewrite
1 parent aa5a477 commit 01c9944

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
</rule>
144144

145145
<rule dir="OUT" name="YARNUI/yarn/outbound/proxy" pattern="*://*:*/proxy/{**}">
146-
<rewrite template="{$frontend[url]}/yarn/proxy/{**}/"/>
146+
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
147147
</rule>
148148
<rule flow="OR" dir="OUT" name="YARNUI/yarn/outbound/headers/jobhistory/job/location">
149149
<match pattern="{scheme}://{host}:{port}/jobhistory/logs/{**}">
@@ -241,15 +241,15 @@
241241

242242
<rule flow="OR" dir="OUT" name="YARNUI/yarn/outbound/apps/history">
243243
<match pattern="*://*:*/proxy/{**}">
244-
<rewrite template="{$frontend[url]}/yarn/proxy/{**}/"/>
244+
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
245245
</match>
246246
<match pattern="/proxy/{**}">
247-
<rewrite template="{$frontend[url]}/yarn/proxy/{**}/"/>
247+
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
248248
</match>
249249
</rule>
250250
<rule dir="OUT" name="YARNUI/yarn/outbound/apps/history1">
251251
<match pattern="/proxy/{**}?{**}"/>
252-
<rewrite template="{$frontend[url]}/yarn/proxy/{**}/?{**}"/>
252+
<rewrite template="{$frontend[url]}/yarn/proxy/{**}?{**}"/>
253253
</rule>
254254

255255
<rule dir="OUT" name="YARNUI/yarn/outbound/cluster/container">
@@ -278,7 +278,7 @@ https://knox_host:knox_port/gateway/yarnui/yarn/nodemanager/node/containerlogs/c
278278
<rewrite template="{$frontend[url]}/yarn/nodemanager/node/containerlogs/{**}?{**}?{scheme}?{host}?{port}"/>
279279
</rule>
280280
<rule dir="OUT" name="YARNUI/yarn/outbound/proxy1" pattern="/proxy/{**}">
281-
<rewrite template="{$frontend[url]}/yarn/proxy/{**}/"/>
281+
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
282282
</rule>
283283

284284
<rule dir="OUT" name="YARNUI/yarn/outbound/nodelink" pattern="{scheme}://{host}:{port}">

gateway-service-definitions/src/main/resources/services/yarnuiv2/3.0.0/rewrite.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@
247247

248248
<rule flow="OR" dir="OUT" name="YARNUIV2/yarnuiv2/outbound/apps/history">
249249
<match pattern="*://*:*/proxy/{**}">
250-
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}/?{**}"/>
250+
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}?{**}"/>
251251
</match>
252252
<match pattern="/proxy/{**}?{**}">
253-
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}/?{**}"/>
253+
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}?{**}"/>
254254
</match>
255255
</rule>
256256

@@ -259,7 +259,7 @@
259259
</rule>
260260

261261
<rule dir="OUT" name="YARNUIV2/yarnuiv2/outbound/proxy" pattern="*://*:*/proxy/{**}">
262-
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}/"/>
262+
<rewrite template="{$frontend[url]}/yarnuiv2/proxy/{**}"/>
263263
</rule>
264264

265265
<rule dir="OUT" name="YARNUIV2/yarnuiv2/outbound/cluster/apps" pattern="*://*:*/cluster/app/{**}">

0 commit comments

Comments
 (0)