Removes special treatment of GCP authentication

ManageIQ/kubeclient#394 (comment)
Shopify · Apr 30, 2019 · 54f7cd2 · 54f7cd2
1 parent 7377fe9
commit 54f7cd2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 131 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## next
 
+*Other*
+- Removes special treatment of GCP authentication by upgrading to `kubeclient` 4.3.
+
 ## 0.26.4
 
 *Bug fixes*

diff --git a/kubernetes-deploy.gemspec b/kubernetes-deploy.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
   spec.add_dependency("activesupport", ">= 5.0")
-  spec.add_dependency("kubeclient", "~> 4.0")
+  spec.add_dependency("kubeclient", "~> 4.3")
   spec.add_dependency("googleauth", "~> 0.6.6") # https://github.com/google/google-auth-library-ruby/issues/153
   spec.add_dependency("ejson", "~> 1.0")
   spec.add_dependency("colorize", "~> 0.8")

diff --git a/lib/kubernetes-deploy/kubeclient_builder.rb b/lib/kubernetes-deploy/kubeclient_builder.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'kubeclient'
-require 'kubernetes-deploy/kubeclient_builder/kube_config'
 
 module KubernetesDeploy
   class KubeclientBuilder
@@ -118,7 +117,7 @@ def validate_config_files!
 
     def build_kubeclient(api_version:, context:, endpoint_path: nil)
       validate_config_files!
-      @kubeclient_configs ||= @kubeconfig_files.map { |f| KubeConfig.read(f) }
+      @kubeclient_configs ||= @kubeconfig_files.map { |f| Kubeclient::Config.read(f) }
       # Find a context defined in kube conf files that matches the input context by name
       config = @kubeclient_configs.find { |c| c.contexts.include?(context) }
       raise ContextMissingError.new(context, @kubeconfig_files) unless config

diff --git a/lib/kubernetes-deploy/kubeclient_builder/kube_config.rb b/lib/kubernetes-deploy/kubeclient_builder/kube_config.rb
diff --git a/test/unit/kubernetes-deploy/kube_config_test.rb b/test/unit/kubernetes-deploy/kube_config_test.rb