From ca52b32b4632bcd8d4ae10c082abf82ff2459b0d Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Tue, 27 Nov 2018 21:05:34 +1300 Subject: Remove monkeypatch as now present in upstream See https://github.com/abonas/kubeclient/blob/v4.0.0/lib/kubeclient/common.rb#L395 --- config/initializers/kubeclient.rb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'config') diff --git a/config/initializers/kubeclient.rb b/config/initializers/kubeclient.rb index 2d9f439fdc0..f8fe1156aaa 100644 --- a/config/initializers/kubeclient.rb +++ b/config/initializers/kubeclient.rb @@ -1,19 +1,4 @@ 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 - # Monkey patch to set `max_redirects: 0`, so that kubeclient # does not follow redirects and expose internal services. # See https://gitlab.com/gitlab-org/gitlab-ce/issues/53158 -- cgit v1.2.3