diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-25 13:49:39 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-25 13:49:39 +0000 |
| commit | 6a88f187be67b8396a23f9b458a2718845af8e5e (patch) | |
| tree | 0cce0920301110031d74d19590a4075438437b61 /spec/support | |
| parent | 5b67839bc33baa5a7cd85aee881f21e4d8fcaa5a (diff) | |
| parent | 911e1c2d07947bba38856c1e033f344d0753f5cf (diff) | |
| download | gitlab-ce-6a88f187be67b8396a23f9b458a2718845af8e5e.tar.gz | |
Merge branch 'fix-kubernetes-namespace' into 'master'
Fix terminals support for Kubernetes service
Closes #31754
See merge request !11653
Diffstat (limited to 'spec/support')
| -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']), |