Merge branch 'ee-fix-kubernetes-namespace' into 'master'

Ee fix kubernetes namespace

See merge request !2014

app/models/project_services/kubernetes_service.rb

@@ -77,6 +77,14 @@ class KubernetesService < DeploymentService
     ]
   end
 
+  def actual_namespace
+    if namespace.present?
+      namespace
+    else
+      default_namespace
+    end
+  end
+
   # Check we can connect to the Kubernetes API
   def test(*args)
     kubeclient = build_kubeclient!
@@ -91,7 +99,7 @@ class KubernetesService < DeploymentService
     variables = [
       { key: 'KUBE_URL', value: api_url, public: true },
       { key: 'KUBE_TOKEN', value: token, public: false },
-      { key: 'KUBE_NAMESPACE', value: namespace_variable, public: true }
+      { key: 'KUBE_NAMESPACE', value: actual_namespace, public: true }
     ]
 
     if ca_pem.present?
@@ -109,7 +117,7 @@ class KubernetesService < DeploymentService
   def terminals(environment)
     with_reactive_cache do |data|
       pods = filter_by_label(data[:pods], app: environment.slug)
-      terminals = pods.flat_map { |pod| terminals_for_pod(api_url, namespace, pod) }
+      terminals = pods.flat_map { |pod| terminals_for_pod(api_url, actual_namespace, pod) }
       terminals.each { |terminal| add_terminal_auth(terminal, terminal_auth) }
     end
   end
@@ -139,20 +147,12 @@ class KubernetesService < DeploymentService
     default_namespace || TEMPLATE_PLACEHOLDER
   end
 
-  def namespace_variable
-    if namespace.present?
-      namespace
-    else
-      default_namespace
-    end
-  end
-
   def default_namespace
     "#{project.path}-#{project.id}" if project.present?
   end
 
   def build_kubeclient!(api_path: 'api', api_version: 'v1')
-    raise "Incomplete settings" unless api_url && namespace && token
+    raise "Incomplete settings" unless api_url && actual_namespace && token
 
     ::Kubeclient::Client.new(
       join_api_url(api_path),
@@ -167,7 +167,7 @@ class KubernetesService < DeploymentService
   def read_pods
     kubeclient = build_kubeclient!
 
-    kubeclient.get_pods(namespace: namespace).as_json
+    kubeclient.get_pods(namespace: actual_namespace).as_json
   rescue KubeException => err
     raise err unless err.error_code == 404
     []
@@ -176,7 +176,7 @@ class KubernetesService < DeploymentService
   def read_deployments
     kubeclient = build_kubeclient!(api_path: 'apis/extensions', api_version: 'v1beta1')
 
-    kubeclient.get_deployments(namespace: namespace).as_json
+    kubeclient.get_deployments(namespace: actual_namespace).as_json
   rescue KubeException => err
     raise err unless err.error_code == 404
     []

changelogs/unreleased/fix-terminals-support-for-kubernetes-service.yml

+---
+title: Fix terminals support for Kubernetes Service
+merge_request:
+author:

spec/factories/services.rb

@@ -20,7 +20,6 @@ FactoryGirl.define do
     project factory: :empty_project
     active true
     properties({
-      namespace: 'somepath',
       api_url: 'https://kubernetes.example.com',
       token: 'a' * 40
     })

spec/models/project_services/kubernetes_service_spec.rb

@@ -87,6 +87,34 @@ describe KubernetesService, models: true, caching: true do
     end
   end
 
+  describe '#actual_namespace' do
+    subject { service.actual_namespace }
+
+    it "returns the default namespace" do
+      is_expected.to eq(service.send(:default_namespace))
+    end
+    
+    context 'when namespace is specified' do
+      before do
+        service.namespace = 'my-namespace'
+      end
+
+      it "returns the user-namespace" do
+        is_expected.to eq('my-namespace')
+      end
+    end
+
+    context 'when service is not assigned to project' do
+      before do
+        service.project = nil
+      end
+
+      it "does not return namespace" do
+        is_expected.to be_nil
+      end
+    end
+  end
+
   describe '#test' do
     let(:discovery_url) { 'https://kubernetes.example.com/api/v1' }
 
@@ -179,6 +207,7 @@ describe KubernetesService, models: true, caching: true do
 
   describe '#terminals' do
     let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") }
+
     subject { service.terminals(environment) }
 
     context 'with invalid pods' do

spec/support/kubernetes_helpers.rb

@@ -20,14 +20,14 @@ module KubernetesHelpers
 
   def stub_kubeclient_pods(response = nil)
     stub_kubeclient_discover
-    pods_url = service.api_url + "/api/v1/namespaces/#{service.namespace}/pods"
+    pods_url = service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods"
 
     WebMock.stub_request(:get, pods_url).to_return(response || kube_pods_response)
   end
 
   def stub_kubeclient_deployments(response = nil)
     stub_kubeclient_discover
-    deployments_url = service.api_url + "/apis/extensions/v1beta1/namespaces/#{service.namespace}/deployments"
+    deployments_url = service.api_url + "/apis/extensions/v1beta1/namespaces/#{service.actual_namespace}/deployments"
 
     WebMock.stub_request(:get, deployments_url).to_return(response || kube_deployments_response)
   end
@@ -112,7 +112,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']),