Add tests for default loading, address comments.

Author: brendandburns

kubernetes/lib/kubernetes/configuration.rb

@@ -153,35 +153,6 @@ def self.default
       @@default ||= Configuration.new
     end
 
-    def self.default_config()
-      # KUBECONFIG environment variable
-      result = Configuration.new()
-      kc = "#{ENV['KUBECONFIG']}"
-      if File.exist?(kc)
-        k_config = KubeConfig.new(kc)
-        k_config.configure(result)
-        return result
-      end
-      # default home location
-      kc = "#{ENV['HOME']}/.kube/config"
-      if File.exist?(kc)
-        k_config = KubeConfig.new(kc)
-        k_config.configure(result)
-        return result
-      end
-      # In cluster config
-      if InClusterConfig::is_in_cluster()
-        k_config = InClusterConfig.new()
-        k_config.configure(result)
-        return result
-      end
-
-      result.scheme = 'http'
-      result.host = 'localhost:8080'
-      return result
-    end
-
-
     def configure
       yield(self) if block_given?
     end

kubernetes/spec/config/kube_config_spec.rb

@@ -13,12 +13,13 @@
 # limitations under the License.
 
 require 'base64'
-require 'spec_helper'
 require 'config/matchers'
 require 'fixtures/config/kube_config_hash'
 require 'helpers/file_fixtures'
+require 'spec_helper'
 
 require 'kubernetes/config/kube_config'
+require 'kubernetes/loader'
 
 
 describe Kubernetes::KubeConfig do
@@ -247,5 +248,61 @@
         expect(kube_config.send(:create_temp_file_with_base64content, content)).to eq(expected_path)
       end
     end
+
+    context 'load from defaults' do
+      before(:each) do
+        # Clear out everything before each run.
+        ENV['HOME'] = nil
+        ENV['KUBECONFIG'] = nil
+        ENV['KUBERNETES_SERVICE_HOST'] = nil
+        ENV['KUBERNETES_SERVICE_PORT'] = nil
+        
+        # Suppress warnings
+        warn_level = $VERBOSE
+        $VERBOSE = nil
+        Kubernetes::InClusterConfig::SERVICE_TOKEN_FILENAME = '/non/existent/file/token'
+        Kubernetes::InClusterConfig::SERVICE_CA_CERT_FILENAME = '/non/existent/file/ca.crt'
+        $VERBOSE = warn_level
+      end
+
+      it 'should load from KUBECONFIG' do
+        ENV['KUBECONFIG'] = Kubernetes::Testing::file_fixture('config/config_2').to_s
+        ENV['HOME'] = Kubernetes::Testing::file_fixture('config').to_s
+        config = Kubernetes::Configuration::default_config
+
+        expect(config.host).to eq('other:8080')
+      end
+
+      it 'should load from HOME' do
+        ENV['HOME'] = Kubernetes::Testing::file_fixture('config').to_s
+        config = Kubernetes::Configuration::default_config
+
+        expect(config.host).to eq('firstconfig:8080')
+      end
+
+      it 'should load from cluster' do
+        ENV['KUBERNETES_SERVICE_HOST'] = 'kubernetes'
+        ENV['KUBERNETES_SERVICE_PORT'] = '8888'
+
+        # Suppress warnings
+        warn_level = $VERBOSE
+        $VERBOSE = nil
+
+        # Override constants for token and cert locations
+        Kubernetes::InClusterConfig::SERVICE_TOKEN_FILENAME = Kubernetes::Testing::file_fixture('config/config').to_s
+        Kubernetes::InClusterConfig::SERVICE_CA_CERT_FILENAME = Kubernetes::Testing::file_fixture('certs/ca.crt').to_s
+        $VERBOSE = warn_level
+
+        config = Kubernetes::Configuration::default_config
+
+        expect(config.host).to eq('kubernetes:8888')
+      end
+
+      it 'should default to localhost' do
+        config = Kubernetes::Configuration::default_config
+
+        expect(config.host).to eq('localhost:8080')
+      end
+    end
   end
 end

kubernetes/spec/fixtures/files/config/.kube/config

@@ -0,0 +1,16 @@
+apiVersion: v1
+clusters:
+- name: default
+  cluster:
+    server: http://firstconfig:8080
+contexts:
+- name: first_user
+  context:
+    cluster: default
+    user: first_user
+current-context: first_user
+kind: Config
+preferences: {}
+users:
+- name: first_user
+  token: foobar

kubernetes/spec/fixtures/files/config/config_2

@@ -0,0 +1,15 @@
+apiVersion: v1
+clusters:
+- name: default
+  cluster:
+    server: http://other:8080
+contexts:
+- name: some_user
+  context:
+    cluster: default
+    user: someone
+current-context: some_user
+kind: Config
+preferences: {}
+users:
+- name: someone

kubernetes/spec/helpers/file_fixtures.rb

@@ -28,7 +28,7 @@ def file_fixture(fixture_name)
           path
         else
           msg = "the directory '%s' does not contain a file named '%s'"
-          raise ArgumentError, msg % [file_fixture_path, fixture_name]
+          raise ArgumentError, msg % [FIXTURES_DIR_PATH, fixture_name]
         end
       end
     end

kubernetes/src/kubernetes/config/incluster_config.rb

@@ -36,7 +36,7 @@ def validate
       raise ConfigError.new("Service token file does not exists") unless File.file?(self.ca_cert)
     end
 
-    def self.is_in_cluster()
+    def self.in_cluster?()
       return File.exist?(SERVICE_TOKEN_FILENAME) && File.exist?(SERVICE_CA_CERT_FILENAME)
     end
 

kubernetes/src/kubernetes/config/kube_config.rb

@@ -57,6 +57,9 @@ def config
 
     def configure(configuration, context_name=nil)
       context = context_name ? self.find_context(context_name) : self.current_context
+      if !context
+        return
+      end
       user = context['user'] || {}
       cluster = context['cluster'] || {}
 
@@ -92,6 +95,9 @@ def find_cluster(name)
 
     def find_user(name)
       self.find_by_name(self.config['users'], 'user', name).tap do |user|
+        if !user
+          return
+        end
         create_temp_file_and_set(user, 'client-certificate')
         create_temp_file_and_set(user, 'client-key')
         # If tokenFile is specified, then set token
@@ -122,7 +128,9 @@ def find_context(name)
     end
 
     def current_context
-      find_context(self.config['current-context'])
+      if self.config
+        find_context(self.config['current-context'])
+      end
     end
 
     protected
@@ -133,6 +141,9 @@ def find_by_name(list, key, name)
     end
 
     def create_temp_file_and_set(obj, key)
+      if !obj
+        return
+      end
       if !obj[key] && obj["#{key}-data"]
         obj[key] = create_temp_file_with_base64content(obj["#{key}-data"])
       end