summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-05-08 17:28:05 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-05-23 17:27:32 +0200
commitc769a3c258e84d7ba42265f02b763b753b07a05e (patch)
treeb97cc5ef20b16022d2e019abd5134220bee810b1 /spec/support
parent8f6619885f95bdafaacddacda4c552f30e8a90a4 (diff)
downloadgitlab-ce-fix-kubernetes-namespace.tar.gz
Fix terminals support for Kubernetes servicefix-kubernetes-namespace
It was broken, because we introduced a default namespace, which was not used by terminal methods.
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/kubernetes_helpers.rb2
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']),