diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-08 17:28:05 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-25 15:03:39 +0200 |
commit | 911e1c2d07947bba38856c1e033f344d0753f5cf (patch) | |
tree | b24d6af8bbdc076cab3cd4a6600e6ec40c5a3950 /spec/support/kubernetes_helpers.rb | |
parent | 7c7fe22c27820b941af51bdef84c3832dda0683e (diff) | |
download | gitlab-ce-911e1c2d07947bba38856c1e033f344d0753f5cf.tar.gz |
Fix terminals support for Kubernetes service
It was broken, because we introduced a default namespace, which was not used by terminal methods.
Diffstat (limited to 'spec/support/kubernetes_helpers.rb')
-rw-r--r-- | spec/support/kubernetes_helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/kubernetes_helpers.rb b/spec/support/kubernetes_helpers.rb index d2a1ded57ff..9280fad4ace 100644 --- a/spec/support/kubernetes_helpers.rb +++ b/spec/support/kubernetes_helpers.rb @@ -41,7 +41,7 @@ module KubernetesHelpers containers.map do |container| terminal = { selectors: { pod: pod_name, container: container['name'] }, - url: container_exec_url(service.api_url, service.namespace, pod_name, container['name']), + url: container_exec_url(service.api_url, service.actual_namespace, pod_name, container['name']), subprotocols: ['channel.k8s.io'], headers: { 'Authorization' => ["Bearer #{service.token}"] }, created_at: DateTime.parse(pod['metadata']['creationTimestamp']), |