Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2018-01-04 19:01:13 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2018-01-04 19:01:13 +0300
commit09473b192c70ada66148dace8c6196ccabfa1dd9 (patch)
tree3cc78721780472c9401fc2451364d5e575c42468 /app/models/clusters
parentae9c8277d9c9fdc1ee9f190b610f756fbc999863 (diff)
Test Prometheus proxy client generation
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/prometheus.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index ac9ea707f62..8a135237b89 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -40,15 +40,20 @@ module Clusters
end
def proxy_client
- return unless cluster.kubeclient
+ return unless kube_client
- kube_client = cluster.kubeclient
proxy_url = kube_client.proxy_url('service', service_name, service_port, Gitlab::Kubernetes::Helm::NAMESPACE)
# ensures headers containing auth data are appended to original k8s client options
options = kube_client.rest_client.options.merge(headers: kube_client.headers)
RestClient::Resource.new(proxy_url, options)
end
+
+ private
+
+ def kube_client
+ cluster&.kubeclient
+ end
end
end
end