Merge branch 'master' into triggermesh-phase1-knative

1 files changed, 2 insertions, 4 deletions

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 263b7d9d01e..d961130d251 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -108,7 +108,7 @@ module Clusters
       end
 
       def kubeclient
-        @kubeclient ||= build_kube_client!(api_groups: ['api', 'apis/rbac.authorization.k8s.io'])
+        @kubeclient ||= build_kube_client!
       end
 
       private
@@ -137,7 +137,7 @@ module Clusters
         Gitlab::NamespaceSanitizer.sanitize(slug)
       end
 
-      def build_kube_client!(api_groups: ['api'], api_version: 'v1')
+      def build_kube_client!
         raise "Incomplete settings" unless api_url && actual_namespace
 
         unless (username && password) || token
@@ -146,8 +146,6 @@ module Clusters
 
         Gitlab::Kubernetes::KubeClient.new(
           api_url,
-          api_groups,
-          api_version,
           auth_options: kubeclient_auth_options,
           ssl_options: kubeclient_ssl_options,
           http_proxy_uri: ENV['http_proxy']