Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'

Resolve "Prometheus integration fails on k8s 1.10"

Closes #46259

See merge request gitlab-org/gitlab-ce!19082

1 files changed, 16 insertions, 0 deletions

diff --git a/config/initializers/kubeclient.rb b/config/initializers/kubeclient.rb
new file mode 100644
index 00000000000..7f115268b37
--- /dev/null
+++ b/config/initializers/kubeclient.rb
@@ -0,0 +1,16 @@
+class Kubeclient::Client
+  # We need to monkey patch this method until
+  # https://github.com/abonas/kubeclient/pull/323 is merged
+  def proxy_url(kind, name, port, namespace = '')
+    discover unless @discovered
+    entity_name_plural =
+      if %w[services pods nodes].include?(kind.to_s)
+        kind.to_s
+      else
+        @entities[kind.to_s].resource_name
+      end
+
+    ns_prefix = build_namespace_prefix(namespace)
+    rest_client["#{ns_prefix}#{entity_name_plural}/#{name}:#{port}/proxy"].url
+  end
+end