Skip to content

Commit 97c7091

Browse files
authored
[UI] use safe defaults for fetching cluster logs (zalando#1872)
* [UI] use safe defaults for fetching cluster logs
1 parent a77d5df commit 97c7091

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ui/operator_ui/main.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,11 +961,13 @@ def get_operator_get_logs(worker: int):
961961
@app.route('/operator/clusters/<namespace>/<cluster>/logs')
962962
@authorize
963963
def get_operator_get_logs_per_cluster(namespace: str, cluster: str):
964+
team, cluster_name = cluster.split('-', 1)
965+
# team id might contain hyphens, try to find correct team name
964966
user_teams = get_teams_for_user(session.get('user_name', ''))
965967
for user_team in user_teams:
966-
if cluster.find(user_team) == 0:
968+
if cluster.find(user_team + '-') == 0:
967969
team = cluster[:len(user_team)]
968-
cluster_name = cluster[len(user_team)+1:]
970+
cluster_name = cluster[len(user_team + '-'):]
969971
break
970972
return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')
971973

0 commit comments

Comments
 (0)