@@ -66,62 +66,6 @@ http {
66
66
proxy_set_header X-Scheme $scheme ;
67
67
}
68
68
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
-
125
69
location /api/k8s/ {
126
70
# Kube-API
127
71
auth_request /oauth2/auth;
@@ -154,7 +98,6 @@ http {
154
98
}
155
99
156
100
location /api/k8s/plugins/tekton-results/ {
157
- auth_request_set $email $upstream_http_x_auth_request_email ;
158
101
auth_request /oauth2/auth;
159
102
160
103
rewrite /api/k8s/plugins/tekton-results/(.+) /$1 break;
@@ -174,9 +117,9 @@ http {
174
117
}
175
118
176
119
location @namespacelister {
177
- auth_request_set $username $upstream_http_x_auth_request_preferred_username ;
178
120
auth_request /oauth2/auth;
179
121
proxy_read_timeout 30m ;
122
+ auth_request_set $username $upstream_http_x_auth_request_preferred_username ;
180
123
proxy_set_header X-User $username ;
181
124
proxy_set_header X-Group system:authenticated;
182
125
@@ -186,10 +129,8 @@ http {
186
129
}
187
130
188
131
location @kubeapi {
189
- auth_request_set $username $upstream_http_x_auth_request_preferred_username ;
190
132
auth_request /oauth2/auth;
191
133
proxy_read_timeout 30m ;
192
- proxy_set_header X-User $username ;
193
134
194
135
rewrite ^/api/k8s/(.*)/$ /$1 break;
195
136
0 commit comments