dapp 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7114fd303ed284e6a00e4e35047b43577d346d
-  data.tar.gz: 4a5e24ab8bcbf23b781a97988be0a975188d75db
+  metadata.gz: ed07e4ba41f680a79acc2f27a826dec12bf5ba77
+  data.tar.gz: 981b7d0951b7361e9b20ab6469e7d797cabf0de3
 SHA512:
-  metadata.gz: 6581f92f31676b7e98707f2774ca3afed77ba3420cb8ebb5617d40c11a203077f5750c71607d7767e5c94d3b9551ee5413b2ad8a540bc2a71de670b7e9fd9cf4
-  data.tar.gz: bb0284c586d5d24679a55e97c4eeb23e2bf23a847ad5365f595876bca37ecf85ea9e959a79668fbc95fd1ed2f6345645a834a71d0dcc2e4cf277158127fae7f1
+  metadata.gz: 058341b114a2978ca617951f957500227ae76ef4f074c23f6a68e3c9845880ff9778dc435fdd7256fa0b8ba18893bc41748179573498f111869ffe9de8cb3517
+  data.tar.gz: 2251d7ce20c67b6103821aa808da48fde2de2d8a850591155a4eff6bf19288f27bc39636f218d4a096a556b9dd33befd22c75239dbf79997dffffc20c6946507

data/config/en/net_status.yml

@@ -112,4 +112,4 @@ en:
       bootstrap_image_not_found: "Bootstrap failed because `%{reason}`: `%{message}`"
     kubernetes:
       kube_config_not_found: "Kube config `%{path}` not found!"
-      kube_server_connection_refused: "Kube server `%{url}` connection refused!"
+      kube_server_connection_refused: "Kube server `%{url}` connection refused: %{error}"

data/lib/dapp.rb

@@ -99,7 +99,8 @@ require 'dapp/deployment/dapp/dappfile'
 require 'dapp/deployment/dapp/dapp'
 require 'dapp/deployment/secret'
 require 'dapp/kube'
-require 'dapp/kube/kubernetes'
+require 'dapp/kube/client'
+require 'dapp/kube/client/error'
 require 'dapp/kube/cli/command/base'
 require 'dapp/kube/cli/command/kube'
 require 'dapp/kube/cli/command/kube/deploy'

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -10,7 +10,7 @@ Options:
 BANNER
       option :namespace,
              long: '--namespace NAME',
-             required: true
+             default: nil
 
       option :image_version,
              long: '--image-version IMAGE_VERSION',
@@ -20,10 +20,15 @@ BANNER
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
+      option :helm_set_options,
+             long: '--set STRING_ARRAY',
+             default: [],
+             proc: proc { |v| composite_options(:helm_set) << v }
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self, 'repo')
-        ::Dapp::Dapp.new(options: cli_options(apps_patterns: cli_arguments, repo: repo)).public_send(run_method)
+        ::Dapp::Dapp.new(options: cli_options(repo: repo)).public_send(run_method)
       end
     end
   end

data/lib/dapp/kube/cli/command/kube/dismiss.rb

@@ -11,7 +11,7 @@ BANNER
 
       option :namespace,
              long: '--namespace NAME',
-             required: true
+             default: nil
 
       option :with_namespace,
              long: '--with-namespace',

data/lib/dapp/kube/cli/command/kube/secret_file_encrypt.rb

@@ -10,7 +10,7 @@ Options:
 BANNER
 
       option :output_file_path,
-             short: '-o OUTPUt_FILE_PATH',
+             short: '-o OUTPUT_FILE_PATH',
              required: false
 
       def run(argv = ARGV)

data/lib/dapp/kube/{kubernetes.rb → client.rb}

@@ -1,13 +1,13 @@
 module Dapp
   module Kube
-    class Kubernetes
+    class Client
       def initialize(namespace: nil)
         @namespace = namespace
         @query_parameters = {}
       end
 
       def namespace
-        @namespace || 'default'
+        @namespace || kube_context_config['context']['namespace']
       end
 
       # Чтобы не перегружать методы явной передачей namespace.
@@ -147,34 +147,84 @@ module Dapp
 
       def with_connection(excon_parameters: {}, &blk)
         old_ssl_ca_file = Excon.defaults[:ssl_ca_file]
+        old_ssl_cert_store = Excon.defaults[:ssl_cert_store]
         old_middlewares = Excon.defaults[:middlewares].dup
 
         begin
-          Excon.defaults[:ssl_ca_file] = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority', nil)
+          ssl_cert_store = OpenSSL::X509::Store.new
+          if ssl_ca_file = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority', nil)
+            ssl_cert_store.add_file ssl_ca_file
+          elsif ssl_ca_data = kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('certificate-authority-data', nil)
+            ssl_cert_store.add_cert OpenSSL::X509::Certificate.new(Base64.decode64(ssl_ca_data))
+          end
+
+          Excon.defaults[:ssl_ca_file] = nil
+          Excon.defaults[:ssl_cert_store] = ssl_cert_store
           Excon.defaults[:middlewares] << Excon::Middleware::RedirectFollower
 
-          return yield Excon.new(kube_server_url, **kube_server_options(excon_parameters))
+          connection = begin
+            Excon.new(kube_cluster_config['cluster']['server'], **kube_server_options(excon_parameters)).tap(&:get)
+          rescue Excon::Error::Socket => err
+            raise Error::ConnectionRefused,
+              code: :kube_server_connection_refused,
+              data: { kube_cluster_config: kube_cluster_config, kube_user_config: kube_user_config, error: err.message }
+          end
+
+          return yield connection
         ensure
           Excon.defaults[:ssl_ca_file] = old_ssl_ca_file
+          Excon.defaults[:ssl_cert_store] = old_ssl_cert_store
           Excon.defaults[:middlewares] = old_middlewares
         end
       end
 
-      def kube_server_url
-        @kube_server_url ||= begin
-          kube_config.fetch('clusters', [{}]).first.fetch('cluster', {}).fetch('server', nil).tap do |url|
-            begin
-              Excon.new(url, **kube_server_options).get
-            rescue Excon::Error::Socket
-              raise Error::ConnectionRefused, code: :kube_server_connection_refused, data: { url: url }
-            end
+      def kube_server_options(excon_parameters = {})
+        {}.tap do |opts|
+          client_cert = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-certificate', nil)
+          opts[:client_cert] = client_cert if client_cert
+
+          client_cert_data = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-certificate-data', nil)
+          opts[:client_cert_data] = Base64.decode64(client_cert_data) if client_cert_data
+
+          client_key = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-key', nil)
+          opts[:client_key] = client_key if client_key
+
+          client_key_data = kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-key-data', nil)
+          opts[:client_key_data] = Base64.decode64(client_key_data) if client_key_data
+        end
+      end
+
+      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
         end
       end
 
-      def kube_server_options(excon_parameters = {})
-        { client_cert: kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-certificate', nil),
-          client_key: kube_config.fetch('users', [{}]).first.fetch('user', {}).fetch('client-key', nil) }.merge(excon_parameters)
+      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
+        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
+        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
+        end
       end
 
       def kube_config

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

@@ -0,0 +1,21 @@
+module Dapp
+  module Kube
+    module Client::Error
+      class Base < ::Dapp::Deployment::Error::Kubernetes
+        def initialize(**net_status)
+          super(**net_status, context: :kubernetes)
+        end
+      end
+
+      class NotFound < Base
+        def initialize(**net_status)
+          super({code: :not_found}.merge(net_status))
+        end
+      end
+
+      class Timeout < Base; end
+      class ConnectionRefused < Base; end
+      class BadConfig < Base; end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Dapp
           end
 
           def kubernetes
-            @kubernetes ||= Kubernetes.new(namespace: kube_namespace)
+            @kubernetes ||= Client.new(namespace: kube_namespace)
           end
         end
       end

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

@@ -27,7 +27,7 @@ module Dapp
                 options << "--set global.dapp.repo=#{repo}"
                 options << "--set global.dapp.image_version=#{image_version}"
                 options << "--set global.namespace=#{kube_namespace}"
-                options << "--set global.env=#{kube_namespace}"
+                options.concat(self.options[:helm_set_options].map { |opt| "--set #{opt}" })
               end
 
               kube_flush_hooks_jobs(additional_values, set_options)
@@ -86,19 +86,25 @@ module Dapp
             cont = <<-EOF
 {{/* vim: set filetype=mustache: */}}
 
+{{- define "dimg" -}}                                                                               
+{{- $name := index . 0 -}}                                                                          
+{{- $context := index . 1 -}}                                                                       
+{{- printf "%s:%s-%s" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
+{{- end -}}                                                                                         
+
 {{- define "dapp_secret_file" -}}
 {{- $relative_file_path := index . 0 -}}
 {{- $context := index . 1 -}}
 {{- $context.Files.Get (print "#{secret_directory}/" $relative_file_path) -}}
 {{- end -}}
             EOF
-            kube_tmp_chart_path('templates/dapp_secret_file.tpl').write(cont)
+            kube_tmp_chart_path('templates/_dapp_helpers.tpl').write(cont)
           end
 
           def kube_flush_hooks_jobs(additional_values, set_options)
             return if (config_jobs_names = kube_helm_hooks_jobs_to_delete(additional_values, set_options).keys).empty?
-            kube_job_list.reject { |name| config_jobs_names.include? name }.each do
-              log_process("Delete hooks job `#{job_name}` for release #{kube_release_name} ", short: true) { kube_delete_job!(name) }
+            config_jobs_names.select { |name| kube_job_list.include? name }.each do |name|
+              log_process("Delete hooks job `#{name}` for release #{kube_release_name} ", short: true) { kube_delete_job!(name) }
             end
           end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.13.1'.freeze
   BUILD_CACHE_VERSION = 13
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -625,6 +625,8 @@ files:
 - lib/dapp/kube/cli/command/kube/secret_file_encrypt.rb
 - lib/dapp/kube/cli/command/kube/secret_generate.rb
 - lib/dapp/kube/cli/command/kube/secret_key_generate.rb
+- lib/dapp/kube/client.rb
+- lib/dapp/kube/client/error.rb
 - lib/dapp/kube/dapp/command/common.rb
 - lib/dapp/kube/dapp/command/deploy.rb
 - lib/dapp/kube/dapp/command/dismiss.rb
@@ -634,7 +636,6 @@ files:
 - lib/dapp/kube/dapp/dapp.rb
 - lib/dapp/kube/error/base.rb
 - lib/dapp/kube/error/command.rb
-- lib/dapp/kube/kubernetes.rb
 - lib/dapp/kube/secret.rb
 - lib/dapp/prctl.rb
 - lib/dapp/version.rb