dapp 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767fd53a4c1d7206a3f9e7f94076eea3c21fb99f9221b8d05648f4798736a699
-  data.tar.gz: be17e4e371969d98f96a7d7c1b79768b35bd277e262c0fa0295ce17d0db890f8
+  metadata.gz: 6c75ea637d359d2090871e5069ecab913d92ac7c1daaf2d683e0c70bc5fd636a
+  data.tar.gz: 6a0881dca7824efef341e27cd47e74e49874df9b6e806fa91d36ac78f234820e
 SHA512:
-  metadata.gz: 6855db575b0ae8392f2c718fc226aa2d7c849623ecce99ca0331b9f7fd1e353ddf894e53345acd3a7e0da48469ea6db2b7168fe6d2c782bcefe35df73b844bcf
-  data.tar.gz: f71e683cb58fc85bfdb96997dfee161dc77e021e8a554ad8bc54f12a59c1a93ce404a747eea85382abd536ef104a679a2af9e6e5ebc3f92013af87c512aff0bd
+  metadata.gz: 2046f3d7320ac03db82faef2251407a38ae63173b4ff90eff205a2ed04e5cccbfd562ee7c5a52bc9c0b62d01d080155f16b8d0056342ec54133dc842f77418fc
+  data.tar.gz: ed4bff41fc5a25d3e34cb3059dad42c3268dbed19fa90efa7f804798b21c5a0ef64d5906df9bd33826669ce5b9438d428d02f3eecbe5a454fb636a69939a8f52

data/lib/dapp/kube/dapp/command/common.rb

@@ -143,10 +143,6 @@ module Dapp
             "#{name}-#{kube_namespace}".slugify
           end
 
-          def kube_namespace
-            kubernetes.namespace
-          end
-
           { encode: :generate, decode: :extract }.each do |type, secret_method|
             define_method "kube_helm_#{type}_json" do |secret, json|
               change_json_value = proc do |value|
@@ -225,12 +221,34 @@ module Dapp
             @secret_key_not_found_in ||= []
           end
 
-          def kubernetes
-            @kubernetes ||= begin
-              namespace = options[:namespace].nil? ? nil : options[:namespace].tr('_', '-')
-              Kubernetes::Client.new(namespace: namespace)
+          def namespace_option
+            options[:namespace].nil? ? nil : options[:namespace].tr('_', '-')
+          end
+
+          def kube_namespace
+            namespace_option || begin
+              namespace = "default"
+
+              Kubernetes::Client.tap do |kube|
+                kube_config = kube.kube_config(kube.kube_config_path)
+                if kube_config
+                  kube_context_name = kube.kube_context_name(kube_config)
+                  kube_context_config = kube.kube_context_config(kube_config, kube_context_name)
+
+                  if kube_context_config
+                    context_namespace = kube.kube_context_namespace(kube_context_config)
+                    namespace = context_namespace if context_namespace
+                  end
+                end
+              end
+
+              namespace
             end
           end
+
+          def kubernetes
+            @kubernetes ||= Kubernetes::Client.new(namespace: kube_namespace)
+          end
         end
       end
     end

data/lib/dapp/kube/kubernetes/client.rb

@@ -3,6 +3,7 @@ module Dapp
     module Kubernetes
       class Client
         include Helper::YAML
+        extend Helper::YAML
 
         ::Dapp::Dapp::Shellout::Base.default_env_keys << 'KUBECONFIG'
 
@@ -12,7 +13,7 @@ module Dapp
         end
 
         def namespace
-          @namespace || kube_context_config['context']['namespace'] || 'default'
+          @namespace || self.class.kube_context_namespace(kube_context_config) || "default"
         end
 
         # Чтобы не перегружать методы явной передачей namespace.
@@ -222,48 +223,72 @@ module Dapp
 
         def kube_user_config
           @kube_user_config ||= begin
-            kube_config.fetch('users', []).find {|user| user['name'] == kube_context_config['context']['user']} || begin
-              raise Error::BadConfig, code: :kube_user_not_found, data: {context: kube_context_config}
-            end
+            kube_user_config = self.class.kube_user_config(kube_config, kube_context_config['context']['user'])
+            raise Error::BadConfig, code: :kube_user_not_found, data: {context: kube_context_config} if kube_user_config.nil?
+            kube_user_config
           end
         end
 
         def kube_cluster_config
           @kube_cluster_config ||= begin
-            kube_config.fetch('clusters', []).find {|cluster| cluster['name'] == kube_context_config['context']['cluster']} || begin
-              raise Error::BadConfig, code: :kube_cluster_not_found, data: {context: kube_context_config}
-            end
+            kube_cluster_config = self.class.kube_cluster_config(kube_config, kube_context_config['context']['cluster'])
+            raise Error::BadConfig, code: :kube_cluster_not_found, data: {context: kube_context_config} if kube_cluster_config.nil?
+            kube_cluster_config
           end
         end
 
         def kube_context_config
           @kube_context_config ||= begin
-            kube_config.fetch('contexts', []).find {|context| context['name'] == kube_context_name} || begin
-              raise Error::BadConfig, code: :kube_context_not_found, data: {context_name: kube_context_name}
-            end
+            context_name = self.class.kube_context_name(kube_config)
+            kube_context_config = self.class.kube_context_config(kube_config, context_name)
+            raise Error::BadConfig, code: :kube_context_not_found, data: {context_name: context_name} if kube_context_config.nil?
+            kube_context_config
           end
         end
 
-        def kube_context_name
-          @kube_context_name ||= kube_config['current-context'] || begin
-            if context = kube_config.fetch('contexts', []).first
-              warn "[WARN] .kube/config current-context is not set, using context '#{context['name']}'"
-              context['name']
-            end
+        def kube_config
+          @kube_config ||= begin
+            kube_config = self.class.kube_config(self.class.kube_config_path)
+            raise Error::Base, code: :kube_config_not_found, data: { path: self.class.kube_config_path } if kube_config.nil?
+            kube_config
           end
         end
 
-        def kube_config
-          @kube_config ||= begin
+        class << self
+          def kube_config_path
             kube_config_path = ENV['KUBECONFIG']
             kube_config_path = File.join(ENV['HOME'], '.kube/config') unless kube_config_path
+            kube_config_path
+          end
 
-            if File.exist?(kube_config_path)
-              yaml_load_file(kube_config_path)
-            else
-              raise Error::Base, code: :kube_config_not_found, data: { path: kube_config_path }
+          def kube_config(kube_config_path)
+            yaml_load_file(kube_config_path) if File.exist?(kube_config_path)
+          end
+
+          def kube_context_name(kube_config)
+            kube_config['current-context'] || begin
+              if context = kube_config.fetch('contexts', []).first
+                warn "[WARN] .kube/config current-context is not set, using context '#{context['name']}'"
+                context['name']
+              end
             end
           end
+
+          def kube_context_config(kube_config, kube_context_name)
+            kube_config.fetch('contexts', []).find {|context| context['name'] == kube_context_name}
+          end
+
+          def kube_user_config(kube_config, user_name)
+            kube_config.fetch('users', []).find {|user| user['name'] == user_name}
+          end
+
+          def kube_cluster_config(kube_config, cluster_name)
+            kube_config.fetch('clusters', []).find {|cluster| cluster['name'] == cluster_name}
+          end
+
+          def kube_context_namespace(kube_context_config)
+            kube_context_config['context']['namespace']
+          end
         end
       end # Client
     end # Kubernetes

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.18.3'.freeze
+  VERSION = '0.18.4'.freeze
   BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout