diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-02 21:42:24 +0100 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-02 21:42:24 +0100 |
commit | b38b5ceb8e039283e90dd323327e59c8f608c103 (patch) | |
tree | cc7525f7681e7bdc15add9577fd5bc74705fa0c6 /app/models/clusters/applications/prometheus.rb | |
parent | db2433c36da6410c803163139e41228f9ae3f26b (diff) | |
download | gitlab-ce-b38b5ceb8e039283e90dd323327e59c8f608c103.tar.gz |
Move client creation to Prometheus Application, manufacture proper rest client
Diffstat (limited to 'app/models/clusters/applications/prometheus.rb')
-rw-r--r-- | app/models/clusters/applications/prometheus.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb index 72651a92e54..94cac9277a5 100644 --- a/app/models/clusters/applications/prometheus.rb +++ b/app/models/clusters/applications/prometheus.rb @@ -14,10 +14,6 @@ module Clusters 'stable/prometheus' end - def namespace - Gitlab::Kubernetes::Helm::NAMESPACE - end - def service_name 'prometheus-prometheus-server' end @@ -33,6 +29,17 @@ module Clusters def install_command Gitlab::Kubernetes::Helm::InstallCommand.new(name, chart: chart, chart_values_file: chart_values_file) end + + def proxy_client + return unless cluster.kubeclient + + 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 end end end |