Skip to content

Commit 36ff780

Browse files
committed
konfluxui: clean proxy's configuration
remove deprecated endpoints and unused headers Signed-off-by: Francesco Ilario <[email protected]>
1 parent a9530fc commit 36ff780

File tree

1 file changed

+1
-70
lines changed
  • components/konflux-ui/staging/base/proxy

1 file changed

+1
-70
lines changed

components/konflux-ui/staging/base/proxy/nginx.conf

+1-70
Original file line numberDiff line numberDiff line change
@@ -66,62 +66,6 @@ http {
6666
proxy_set_header X-Scheme $scheme;
6767
}
6868

69-
# Deprecated: Workspaces API are deprecated
70-
location /api/k8s/registration/ {
71-
# Registration Service registration endpoint
72-
auth_request_set $email $upstream_http_x_auth_request_email;
73-
proxy_set_header X-Email $email;
74-
auth_request_set $user $upstream_http_x_auth_request_user;
75-
proxy_set_header X-User $user;
76-
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
77-
proxy_set_header X-Auth-Request-Preferred-Username $username;
78-
auth_request_set $groups $upstream_http_x_auth_request_groups;
79-
proxy_set_header X-Auth-Request-Groups $user;
80-
81-
auth_request /oauth2/auth;
82-
proxy_pass http://127.0.0.1:5000/;
83-
}
84-
85-
# Deprecated: Workspaces API are deprecated
86-
location /api/k8s/apis/toolchain.dev.openshift.com/v1alpha1/workspaces {
87-
# Registration Service workspaces endpoint
88-
auth_request_set $email $upstream_http_x_auth_request_email;
89-
proxy_set_header X-Email $email;
90-
auth_request_set $user $upstream_http_x_auth_request_user;
91-
proxy_set_header X-User $user;
92-
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
93-
proxy_set_header X-Auth-Request-Preferred-Username $username;
94-
auth_request_set $groups $upstream_http_x_auth_request_groups;
95-
proxy_set_header X-Auth-Request-Groups $user;
96-
97-
auth_request /oauth2/auth;
98-
proxy_pass http://127.0.0.1:5000/workspaces;
99-
}
100-
101-
# Deprecated: Workspaces API are deprecated
102-
location /api/k8s/workspaces/ {
103-
# Kube-API
104-
auth_request /oauth2/auth;
105-
106-
rewrite /api/k8s/workspaces/.+?/(.+) /$1 break;
107-
proxy_pass https://kubernetes.default.svc;
108-
proxy_read_timeout 30m;
109-
include /mnt/nginx-generated-config/auth.conf;
110-
}
111-
112-
# Deprecated: Workspaces API are deprecated
113-
location /wss/k8s/workspaces/ {
114-
auth_request /oauth2/auth;
115-
116-
rewrite /wss/k8s/workspaces/.+?/(.+) /$1 break;
117-
proxy_pass https://kubernetes.default.svc/;
118-
proxy_http_version 1.1;
119-
proxy_set_header Upgrade $http_upgrade;
120-
proxy_set_header Connection $connection_upgrade;
121-
proxy_read_timeout 30m;
122-
include /mnt/nginx-generated-config/auth.conf;
123-
}
124-
12569
location /api/k8s/ {
12670
# Kube-API
12771
auth_request /oauth2/auth;
@@ -143,18 +87,7 @@ http {
14387
include /mnt/nginx-generated-config/auth.conf;
14488
}
14589

146-
# Deprecated: Workspaces API are deprecated
147-
location /api/k8s/plugins/tekton-results/workspaces/ {
148-
auth_request /oauth2/auth;
149-
150-
rewrite /api/k8s/plugins/tekton-results/workspaces/.+?/(.+) /$1 break;
151-
proxy_read_timeout 30m;
152-
include /mnt/nginx-generated-config/tekton-results.conf;
153-
include /mnt/nginx-generated-config/auth.conf;
154-
}
155-
15690
location /api/k8s/plugins/tekton-results/ {
157-
auth_request_set $email $upstream_http_x_auth_request_email;
15891
auth_request /oauth2/auth;
15992

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

176109
location @namespacelister {
177-
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
178110
auth_request /oauth2/auth;
179111
proxy_read_timeout 30m;
112+
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
180113
proxy_set_header X-User $username;
181114
proxy_set_header X-Group system:authenticated;
182115

@@ -186,10 +119,8 @@ http {
186119
}
187120

188121
location @kubeapi {
189-
auth_request_set $username $upstream_http_x_auth_request_preferred_username;
190122
auth_request /oauth2/auth;
191123
proxy_read_timeout 30m;
192-
proxy_set_header X-User $username;
193124

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

0 commit comments

Comments
 (0)