diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-30 16:31:47 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-30 16:31:47 +0300 |
| commit | 56c8b35b8460dac53e6d29c3c811da4e57eca66c (patch) | |
| tree | 566efb71c8385a474c8ca08e4401a2782067557e /app/models/project_services/kubernetes_service.rb | |
| parent | ac2c2be97f1a0647630646ebf1e25f9bb0fb5ac9 (diff) | |
| parent | b389ef66d46219abbd671bcdbdfdd2fb142798b8 (diff) | |
Merge branch 'pl-fix-k8s-ns-query-variables' into 'master'
Use correct k8s namespace in Prometheus queries
See merge request gitlab-org/gitlab-ce!27812
Diffstat (limited to 'app/models/project_services/kubernetes_service.rb')
| -rw-r--r-- | app/models/project_services/kubernetes_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index f650dbd3726..fc8afa9bead 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -94,6 +94,10 @@ class KubernetesService < DeploymentService end end + def namespace_for(project) + actual_namespace + end + # Check we can connect to the Kubernetes API def test(*args) kubeclient = build_kube_client! |