Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

konfluxui: clean proxy's configuration #5891

Merged
merged 1 commit into from
Mar 28, 2025
Merged

konfluxui: clean proxy's configuration #5891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 1 addition & 70 deletions components/konflux-ui/staging/base/proxy/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,62 +66,6 @@ http {
proxy_set_header X-Scheme $scheme;
}

# Deprecated: Workspaces API are deprecated
location /api/k8s/registration/ {
# Registration Service registration endpoint
auth_request_set $email $upstream_http_x_auth_request_email;
proxy_set_header X-Email $email;
auth_request_set $user $upstream_http_x_auth_request_user;
proxy_set_header X-User $user;
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
proxy_set_header X-Auth-Request-Preferred-Username $username;
auth_request_set $groups $upstream_http_x_auth_request_groups;
proxy_set_header X-Auth-Request-Groups $user;

auth_request /oauth2/auth;
proxy_pass http://127.0.0.1:5000/;
}

# Deprecated: Workspaces API are deprecated
location /api/k8s/apis/toolchain.dev.openshift.com/v1alpha1/workspaces {
# Registration Service workspaces endpoint
auth_request_set $email $upstream_http_x_auth_request_email;
proxy_set_header X-Email $email;
auth_request_set $user $upstream_http_x_auth_request_user;
proxy_set_header X-User $user;
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
proxy_set_header X-Auth-Request-Preferred-Username $username;
auth_request_set $groups $upstream_http_x_auth_request_groups;
proxy_set_header X-Auth-Request-Groups $user;

auth_request /oauth2/auth;
proxy_pass http://127.0.0.1:5000/workspaces;
}

# Deprecated: Workspaces API are deprecated
location /api/k8s/workspaces/ {
# Kube-API
auth_request /oauth2/auth;

rewrite /api/k8s/workspaces/.+?/(.+) /$1 break;
proxy_pass https://kubernetes.default.svc;
proxy_read_timeout 30m;
include /mnt/nginx-generated-config/auth.conf;
}

# Deprecated: Workspaces API are deprecated
location /wss/k8s/workspaces/ {
auth_request /oauth2/auth;

rewrite /wss/k8s/workspaces/.+?/(.+) /$1 break;
proxy_pass https://kubernetes.default.svc/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 30m;
include /mnt/nginx-generated-config/auth.conf;
}

location /api/k8s/ {
# Kube-API
auth_request /oauth2/auth;
Expand All @@ -143,18 +87,7 @@ http {
include /mnt/nginx-generated-config/auth.conf;
}

# Deprecated: Workspaces API are deprecated
location /api/k8s/plugins/tekton-results/workspaces/ {
auth_request /oauth2/auth;

rewrite /api/k8s/plugins/tekton-results/workspaces/.+?/(.+) /$1 break;
proxy_read_timeout 30m;
include /mnt/nginx-generated-config/tekton-results.conf;
include /mnt/nginx-generated-config/auth.conf;
}

location /api/k8s/plugins/tekton-results/ {
auth_request_set $email $upstream_http_x_auth_request_email;
auth_request /oauth2/auth;

rewrite /api/k8s/plugins/tekton-results/(.+) /$1 break;
Expand All @@ -174,9 +107,9 @@ http {
}

location @namespacelister {
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
auth_request /oauth2/auth;
proxy_read_timeout 30m;
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
proxy_set_header X-User $username;
proxy_set_header X-Group system:authenticated;

Expand All @@ -186,10 +119,8 @@ http {
}

location @kubeapi {
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
auth_request /oauth2/auth;
proxy_read_timeout 30m;
proxy_set_header X-User $username;

rewrite ^/api/k8s/(.*)/$ /$1 break;

Expand Down