Skip to content
Snippets Groups Projects
Commit 750ebc36 authored by Mikhail Mazurskiy's avatar Mikhail Mazurskiy
Browse files

Always disable proxy_intercept_errors for kas

Changelog: fixed
parent f8db0051
No related branches found
No related tags found
2 merge requests!71heptapod#685: making 0.32 the new stable,!69GitLab 14.10 / Heptapod 0.32
......@@ -181,7 +181,8 @@
<% if node['gitlab-kas']['enable'] -%>
location = <%= File.join(@path, '-/kubernetes-agent/') %> {
proxy_pass http://<%= node['gitlab-kas']['listen_address'] %>/;
proxy_intercept_errors off;
}
location <%= File.join(@path, '-/kubernetes-agent/k8s-proxy/') %> {
proxy_pass http://<%= node['gitlab-kas']['kubernetes_api_listen_address'] %>/;
......@@ -184,7 +185,8 @@
}
location <%= File.join(@path, '-/kubernetes-agent/k8s-proxy/') %> {
proxy_pass http://<%= node['gitlab-kas']['kubernetes_api_listen_address'] %>/;
proxy_intercept_errors off;
}
<% end -%>
......
......@@ -63,7 +63,7 @@
it 'uses the default proxy_intercept_errors option when custom_error_pages is not defined' do
chef_runner.node.normal['gitlab']['nginx'].delete('custom_error_pages')
expect(chef_run).to render_file(gitlab_http_config).with_content { |content|
expect(content).not_to include("proxy_intercept_errors")
expect(content).not_to include("proxy_intercept_errors on")
}
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment