diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-01-26 21:16:50 +0300 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-02-06 13:49:30 +0300 |
| commit | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (patch) | |
| tree | f6137cb0baeb01330a1729d00c059988ced600ee /lib/gitlab/kubernetes.rb | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
Introduce maximum session time for terminal websocket connection
Store the value in application settings.
Expose the value to Workhorse.
Diffstat (limited to 'lib/gitlab/kubernetes.rb')
| -rw-r--r-- | lib/gitlab/kubernetes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes.rb b/lib/gitlab/kubernetes.rb index 288771c1c12..3a7af363548 100644 --- a/lib/gitlab/kubernetes.rb +++ b/lib/gitlab/kubernetes.rb @@ -43,10 +43,10 @@ module Gitlab end end - def add_terminal_auth(terminal, token, ca_pem = nil) + def add_terminal_auth(terminal, token:, max_session_time:, ca_pem: nil) terminal[:headers]['Authorization'] << "Bearer #{token}" + terminal[:max_session_time] = max_session_time terminal[:ca_pem] = ca_pem if ca_pem.present? - terminal end def container_exec_url(api_url, namespace, pod_name, container_name) |