dapp 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2398cf5c147d22ffee085269b97c5bb71c604a3
-  data.tar.gz: e7c60b8f1c96ce3ea0b2118e6693f7b1465b0a67
+SHA256:
+  metadata.gz: b824d82111173d42881d595fa087ea22e0f631c4cfd41f679779dd54dd08e5eb
+  data.tar.gz: 65b7d687aed97303a38a64bba5941a97014306fb9cda93e05ca823d40b2ac1bc
 SHA512:
-  metadata.gz: 5a197929f2545c01c003d529324590bcfe547bb26f3ecf66298356011d8ce382536cf94491152d9447f230e52dea63da587035b00b2fb9bdc3cda9f9f0062726
-  data.tar.gz: 166ccc636ab5edb115d5f0d85712be10ddd7dace4db0c4105eb6626ea35cefdc4eca6d594ba6699f6ced0ce2c5147bad2d5d34d69524f1c0111836fa0931d4a6
+  metadata.gz: 738498c3f2f7cbea60cbe147069c7e834b8ea60fa63051afd82899c330f075b5b7b9cead2b219e4eec2be4d38bc085b9f5538f36e18841bd482f66176114a77a
+  data.tar.gz: 05dc719a00c3203e62b03aeac743e0c0bbaa2e7db90c59c38f5cebda1d638f1747ae72606cde6f3c376f725823e1086133e0ab594d674b3341911bbfca26d62f

data/bin/dapp

@@ -5,6 +5,8 @@
 require 'rubygems'
 require 'dapp'
 
+Thread.abort_on_exception = true
+
 begin
   begin
     begin

data/config/en/net_status.yml

@@ -134,6 +134,7 @@ en:
       config_context_not_found: "Context `%{context_name}` is not found in config %{config_path}"
       server_connection_refused: "Kube server `%{url}` connection refused: %{error}"
       server_error: "Kube respond with server error code %{response_http_status}, request parameters: `%{request_parameters}`, response: `%{response_raw_body}`"
+      container_stuck: "Pod's `%{pod_name}` container `%{container_name}` stuck in %{state} state: %{state_reason}: %{state_message}"
     secret:
       bad_data: "Data `%{data}` can't be decrypted: check encryption key and data!"
       key_length_too_short: "Encryption key isn't valid (required size %{required_size} bytes)!"

data/lib/dapp.rb

@@ -108,6 +108,7 @@ require 'dapp/kube/cli/command/kube/minikube_setup'
 require 'dapp/kube/cli/command/kube/chart_create'
 require 'dapp/kube/cli/command/kube/render'
 require 'dapp/kube/cli/command/kube/lint'
+require 'dapp/kube/cli/command/kube/value_get'
 require 'dapp/kube/cli/cli'
 require 'dapp/kube/dapp/command/common'
 require 'dapp/kube/dapp/command/deploy'
@@ -121,6 +122,7 @@ require 'dapp/kube/dapp/command/minikube_setup'
 require 'dapp/kube/dapp/command/chart_create'
 require 'dapp/kube/dapp/command/render'
 require 'dapp/kube/dapp/command/lint'
+require 'dapp/kube/dapp/command/value_get'
 require 'dapp/kube/dapp/dapp'
 require 'dapp/dimg'
 require 'dapp/dimg/builder'

data/lib/dapp/dapp/logging/process.rb

@@ -81,7 +81,7 @@ module Dapp
           message = success_message
           start = Time.now
           with_log_indent { yield }
-        rescue Error::Default, SignalException, StandardError => _e
+        rescue Error::Base, SignalException, StandardError => _e
           message = failed_message
           raise
         ensure

data/lib/dapp/dapp/ssh_agent.rb

@@ -46,10 +46,24 @@ module Dapp
         shellout! "ssh-add #{ssh_key_path}", env: { SSH_AUTH_SOCK: ssh_auth_sock(force_run_agent: true) }
       end
 
+      def ssh_agent_exist?
+        ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
+      end
+
+      def default_ssh_keys
+        @default_ssh_keys ||= begin
+          %w(id_rsa id_dsa).map do |path|
+            File.join(ENV["HOME"], ".ssh", path)
+          end.select do |path|
+            File.exist? path
+          end
+        end
+      end
+
       def ssh_auth_sock(force_run_agent: false)
         @ssh_auth_sock ||= begin
           system_ssh_auth_sock = nil
-          system_ssh_auth_sock = File.expand_path(ENV['SSH_AUTH_SOCK']) if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
+          system_ssh_auth_sock = File.expand_path(ENV['SSH_AUTH_SOCK']) if ssh_agent_exist?
 
           if force_run_agent
             run_ssh_agent.tap { |ssh_auth_sock| ENV['SSH_AUTH_SOCK'] = ssh_auth_sock }
@@ -60,13 +74,17 @@ module Dapp
       end
 
       def setup_ssh_agent
-        return unless options[:ssh_key]
-
-        options[:ssh_key].each do |ssh_key|
-          raise Error::Dapp, code: :ssh_key_not_found, data: { path: ssh_key } unless File.exist? ssh_key
+        if options[:ssh_key]
+          options[:ssh_key].each do |ssh_key|
+            raise Error::Dapp, code: :ssh_key_not_found, data: { path: ssh_key } unless File.exist? ssh_key
 
-          File.chmod 0o600, ssh_key
-          add_ssh_key ssh_key
+            File.chmod 0o600, ssh_key
+            add_ssh_key ssh_key
+          end
+        elsif (not ssh_agent_exist?) and default_ssh_keys.any?
+          default_ssh_keys.each do |ssh_key|
+            add_ssh_key ssh_key
+          end
         end
       end
     end # SshAgent

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

@@ -1,7 +1,7 @@
 module Dapp::Kube::CLI
   module Command
     class Kube < ::Dapp::CLI
-      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret regenerate', 'deploy', 'dismiss', 'secret extract', 'secret edit', 'minikube setup', 'chart create', 'render', 'lint'].freeze
+      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret regenerate', 'deploy', 'dismiss', 'secret extract', 'secret edit', 'minikube setup', 'chart create', 'render', 'lint', 'value get'].freeze
 
       banner <<BANNER.freeze
 Usage: dapp kube subcommand [subcommand options]
@@ -19,6 +19,7 @@ Available subcommands: (for details, dapp kube SUB-COMMAND --help)
   dapp kube chart create [options]
   dapp kube render [options] [REPO]
   dapp kube lint [options] [REPO]
+  dapp kube value get VALUE_KEY
 
 Options:
 BANNER

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

@@ -45,6 +45,12 @@ BANNER
       option :registry_password,
              long: '--registry-password PASSWORD'
 
+      option :without_registry,
+              long: "--without-registry",
+              default: false,
+              boolean: true,
+              description: "Do not connect to docker registry to obtain docker image ids of dimgs being deployed."
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|

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

@@ -0,0 +1,48 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class ValueGet < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube value get [options] VALUE_KEY [REPO]
+
+Options:
+BANNER
+      extend ::Dapp::CLI::Command::Options::Tag
+
+      option :namespace,
+        long: '--namespace NAME',
+        default: nil
+
+      option :registry_username,
+        long: '--registry-username USERNAME'
+
+      option :registry_password,
+        long: '--registry-password PASSWORD'
+
+      option :without_registry,
+        long: "--without-registry",
+        default: false,
+        boolean: true,
+        description: "Do not connect to docker registry to obtain docker image ids of dimgs being deployed."
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+
+        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+          repo = if not cli_arguments[1].nil?
+            self.class.required_argument(self, "repo")
+          else
+            dapp.name
+          end
+          dapp.options[:repo] = repo
+
+          value_key = self.class.required_argument(self, "VALUE_KEY")
+
+          dapp.public_send(run_method, value_key)
+        end
+      end
+
+    end
+  end
+end

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

@@ -6,7 +6,6 @@ module Dapp
           def kube_deploy
             helm_release do |release|
               do_deploy = proc do
-                kube_flush_hooks_jobs(release)
                 kube_run_deploy(release)
               end
 
@@ -23,7 +22,7 @@ module Dapp
               .reject { |job| ['0', 'false'].include? job.annotations["dapp/recreate"].to_s }
               .select { |job| kube_job_list.include? job.name }
               .each do |job|
-                log_process("Delete hooks job `#{job.name}` for release #{release.name}", short: true) do
+                log_process("Delete hooks job `#{job.name}`", short: true) do
                   kube_delete_job!(job.name) unless dry_run?
                 end
               end
@@ -43,6 +42,8 @@ module Dapp
 
           def kube_run_deploy(release)
             log_process("Deploy release #{release.name}") do
+              kube_flush_hooks_jobs(release)
+
               release_exists = shellout("helm status #{release.name}").status.success?
 
               watch_hooks_by_type = release.jobs.values
@@ -69,18 +70,49 @@ module Dapp
               end
 
               watch_hooks_thr = nil
-              unless dry_run?
+              watch_hooks_condition_mutex = ::Mutex.new
+              watch_hooks_condition = ::ConditionVariable.new
+              deploy_has_began = false
+              unless dry_run? and watch_hooks.any?
                 watch_hooks_thr = Thread.new do
-                  watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
-                end
-              end
+                  watch_hooks_condition_mutex.synchronize do
+                    while not deploy_has_began do
+                      watch_hooks_condition.wait(watch_hooks_condition_mutex)
+                    end
+                  end
+
+                  begin
+                    watch_hooks.each do |job|
+                      Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
+                    end # watch_hooks.each
+                  rescue Kubernetes::Error::Default => e
+                    # Default-ошибка -- это ошибка для пользователя которую перехватывает и
+                    # показывает bin/dapp, а затем dapp выходит с ошибкой.
+                    # Нельзя убивать родительский поток по Default-ошибке
+                    # из-за того, что в этот момент в нем вероятно работает helm,
+                    # а процесс деплоя в helm прерывать не стоит.
+                    # Поэтому перехватываем и просто отображаем произошедшую
+                    # ошибку для информации пользователю без завершения работы dapp.
+                    $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(e), :warning))
+                  end
+
+                end # Thread
+              end # unless
 
               deployment_managers = release.deployments.values
                 .map {|deployment| Kubernetes::Manager::Deployment.new(self, deployment.name)}
 
               deployment_managers.each(&:before_deploy)
 
-              release.deploy!
+              log_process("Run helm") do
+                watch_hooks_condition_mutex.synchronize do
+                  deploy_has_began = true
+                  # Фактически гарантируется лишь вывод сообщения log_process перед выводом из потока watch_thr
+                  watch_hooks_condition.signal
+                end
+
+                release.deploy!
+              end
 
               deployment_managers.each(&:after_deploy)
 

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

@@ -0,0 +1,32 @@
+module Dapp
+  module Kube
+    module Dapp
+      module Command
+        module ValueGet
+          def kube_value_get(value_key)
+            service_values = Helm::Values.service_values_hash(
+              self, option_repo, kube_namespace, option_tags.first,
+              without_registry: self.options[:without_registry],
+              disable_warnings: true
+            )
+
+            res = service_values
+            value_key.split(".").each do |value_key_part|
+              if res.is_a?(Hash) && res.key?(value_key_part)
+                res = res[value_key_part]
+              else
+                exit(1)
+              end
+            end
+
+            if res.is_a? Hash
+              puts YAML.dump(res)
+            else
+              puts JSON.dump(res)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/kube/dapp/dapp.rb

@@ -15,6 +15,7 @@ module Dapp
         include Command::ChartCreate
         include Command::Render
         include Command::Lint
+        include Command::ValueGet
         include Command::Common
       end
     end

data/lib/dapp/kube/helm/values.rb

@@ -8,7 +8,7 @@ module Dapp
           self.new(service_values_hash(*a, &b))
         end
 
-        def service_values_hash(dapp, repo, namespace, docker_tag, fake: false, without_registry: false)
+        def service_values_hash(dapp, repo, namespace, docker_tag, fake: false, without_registry: false, disable_warnings: false)
           res = {
             "global" => {
               "namespace" => namespace,
@@ -86,7 +86,9 @@ module Dapp
                 dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.config._name)
                 docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.config._name)
               rescue ::Dapp::Dimg::Error::Registry => err
-                dapp.log_warning "Registry `#{err.net_status[:data][:registry]}` is not availabble: cannot determine <dimg>.docker_image_id and <dimg>.git.<ga>.commit_id helm values of dimg#{dimg.config._name ? " `#{dimg.config._name}`" : nil}"
+                unless disable_warnings
+                  dapp.log_warning "Registry `#{err.net_status[:data][:registry]}` is not availabble: cannot determine <dimg>.docker_image_id and <dimg>.git.<ga>.commit_id helm values of dimg#{dimg.config._name ? " `#{dimg.config._name}`" : nil}"
+                end
               end
             end
 

data/lib/dapp/kube/kubernetes/manager/container.rb

@@ -28,6 +28,21 @@ module Dapp
               pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
               container_state, container_state_data = pod.container_state(name)
 
+              if container_state == "waiting"
+                if container_state_data["reason"] == "RunContainerError"
+                  raise Kubernetes::Error::Default, code: :container_stuck, data: {
+                    state_reason: container_state_data["reason"],
+                    state_message: container_state_data["message"],
+                    state: container_state,
+                    pod_name: pod_manager.name,
+                    container_name: name
+                  }
+                else
+                  sleep 0.1
+                  next
+                end
+              end
+
               chunk_lines_by_time = {}
               begin
                 chunk_lines_by_time = dapp.kubernetes.pod_log(pod_manager.name, container: name, timestamps: true, sinceTime: @processed_log_till_time)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.23.1'.freeze
+  VERSION = '0.23.2'.freeze
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -663,6 +663,7 @@ files:
 - lib/dapp/kube/cli/command/kube/secret_generate.rb
 - lib/dapp/kube/cli/command/kube/secret_key_generate.rb
 - lib/dapp/kube/cli/command/kube/secret_regenerate.rb
+- lib/dapp/kube/cli/command/kube/value_get.rb
 - lib/dapp/kube/dapp/command/chart_create.rb
 - lib/dapp/kube/dapp/command/common.rb
 - lib/dapp/kube/dapp/command/deploy.rb
@@ -675,6 +676,7 @@ files:
 - lib/dapp/kube/dapp/command/secret_generate.rb
 - lib/dapp/kube/dapp/command/secret_key_generate.rb
 - lib/dapp/kube/dapp/command/secret_regenerate.rb
+- lib/dapp/kube/dapp/command/value_get.rb
 - lib/dapp/kube/dapp/dapp.rb
 - lib/dapp/kube/error/default.rb
 - lib/dapp/kube/error/kubernetes.rb
@@ -719,7 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell