dapp 0.13.8 → 0.13.9

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

@@ -0,0 +1,15 @@
+module Dapp
+  module Kube
+    module Kubernetes::Manager
+      class Base
+        attr_reader :dapp
+        attr_reader :name
+
+        def initialize(dapp, name)
+          @dapp = dapp
+          @name = name
+        end
+      end # Base
+    end # Kubernetes::Manager
+  end # Kube
+end # Dapp

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

@@ -0,0 +1,88 @@
+module Dapp
+  module Kube
+    module Kubernetes::Manager
+      class Container < Base
+        attr_reader :pod_manager
+
+        def initialize(dapp, name, pod_manager)
+          super(dapp, name)
+
+          @pod_manager = pod_manager
+          @processed_containers_ids = []
+          @processed_log_till_time = nil
+          @processed_log_timestamps = Set.new
+        end
+
+        def wait_till_created!
+          pod_manager.wait_till_running!
+
+          loop do
+            pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
+            break unless pod.container_state(name).first == 'waiting'
+            sleep 0.1
+          end
+        end
+
+        def watch_till_terminated!
+          pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
+          _, container_state_data = pod.container_state(name)
+          return if @processed_containers_ids.include? container_state_data['containerID']
+
+          wait_till_created!
+
+          pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
+          container_state, container_state_data = pod.container_state(name)
+
+          dapp.log_process("Watch pod's '#{pod_manager.name}' container '#{name}' log") do
+            loop do
+              pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
+              container_state, container_state_data = pod.container_state(name)
+
+              chunk_lines_by_time = dapp.kubernetes.pod_log(pod_manager.name, container: name, timestamps: true, sinceTime: @processed_log_till_time)
+                .lines
+                .map do |line|
+                  timestamp, _, data = line.partition(' ')
+                  [timestamp, data]
+                end
+                .reject {|timestamp, _| @processed_log_timestamps.include? timestamp}
+
+              chunk_lines_by_time.each do |timestamp, data|
+                puts data
+                @processed_log_timestamps.add timestamp
+              end
+
+              if container_state == 'terminated'
+                failed = (container_state_data['exitCode'].to_i != 0)
+
+                warn("".tap do |msg|
+                  msg << "Pod's '#{pod_manager.name}' container '#{name}' has been terminated unsuccessfuly: "
+                  msg << container_state_data.to_s
+                end) if failed
+
+                @processed_containers_ids << container_state_data['containerID']
+
+                break
+              end
+
+              @processed_log_till_time = chunk_lines_by_time.last.first if chunk_lines_by_time.any?
+
+              sleep 0.1 if chunk_lines_by_time.empty?
+            end
+          end # log_process
+        end
+
+        def done?
+          pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
+          container_state, container_state_data = pod.container_state(name)
+          if container_state == 'terminated'
+            failed = (container_state_data['exitCode'].to_i != 0)
+            return true if pod.restart_policy == 'Never'
+            return true if not failed and pod.restart_policy == 'OnFailure'
+          end
+
+          return false
+        end
+      end # Container
+    end # Kubernetes::Manager
+  end # Kube
+end # Dapp

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

@@ -0,0 +1,65 @@
+module Dapp
+  module Kube
+    module Kubernetes::Manager
+      class Job < Base
+        def initialize(dapp, name)
+          super(dapp, name)
+
+          @processed_pods_names = []
+        end
+
+        def wait_till_exists!
+          loop do
+            break if dapp.kubernetes.job?(name)
+            sleep 0.1
+          end
+        end
+
+        def watch_till_done!
+          wait_till_exists!
+
+          job = Kubernetes::Client::Resource::Job.new(dapp.kubernetes.job(name))
+
+          loop do
+            # Получить очередной pod для обработки
+            process_pod = dapp.kubernetes.pod_list.fetch('items', [])
+              .select do |pod_spec|
+                pod_spec.fetch('metadata', {}).fetch('labels', {})['controller-uid'] == job.uid
+              end
+              .reject do |pod_spec|
+                @processed_pods_names.include? pod_spec.fetch('metadata', {})['name']
+              end
+              .sort_by do |pod_spec|
+                Time.parse(pod_spec.fetch('metadata', {})['creationTimestamp'])
+              end
+              .map {|pod_spec| Kubernetes::Client::Resource::Pod.new(pod_spec)}
+              .first
+
+            if process_pod.nil?
+              job = Kubernetes::Client::Resource::Job.new(dapp.kubernetes.job(name))
+              if job.succeeded?
+                break
+              elsif job.failed?
+                warn "Job '#{name}' has been failed: #{job.spec['status']}"
+                break
+              end
+
+              sleep 0.1
+
+              next
+            end
+
+            pod_manager = Kubernetes::Manager::Pod.new(dapp, process_pod.name)
+            begin
+              pod_manager.watch_till_done!
+            rescue Kubernetes::Client::Error::Pod::NotFound => err
+              warn "Pod '#{err.net_status.fetch(:response_body, {}).fetch('details', {})['name']}' has been deleted"
+            ensure
+              @processed_pods_names << process_pod.name
+            end
+          end
+        end
+      end # Job
+    end # Kubernetes::Manager
+  end # Kube
+end # Dapp

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

@@ -0,0 +1,35 @@
+module Dapp
+  module Kube
+    module Kubernetes::Manager
+      class Pod < Base
+        def containers
+          pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(name))
+          @containers ||= pod.containers_names.map do |container_name|
+            Container.new(dapp, container_name, self)
+          end
+        end
+
+        def wait_till_running!
+          loop do
+            pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(name))
+            break if pod.phase == 'Running'
+            sleep 0.1
+          end
+        end
+
+        def watch_till_done!
+          process_queue = containers.map {|c| [c, nil]}
+          loop do
+            container, last_processed_at = process_queue.shift
+            break unless container
+
+            sleep 1 if last_processed_at and (Time.now - last_processed_at < 1)
+
+            container.watch_till_terminated!
+            process_queue.push([container, Time.now]) unless container.done?
+          end
+        end
+      end # Pod
+    end # Kubernetes::Manager
+  end # Kube
+end # Dapp

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.8'.freeze
+  VERSION = '0.13.9'.freeze
   BUILD_CACHE_VERSION = 15
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.8
+  version: 0.13.9
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -619,23 +619,26 @@ files:
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/tar.rb
 - lib/dapp/helper/trivia.rb
+- lib/dapp/helper/yaml.rb
 - lib/dapp/kube.rb
 - lib/dapp/kube/cli/cli.rb
 - lib/dapp/kube/cli/command/base.rb
 - lib/dapp/kube/cli/command/kube.rb
+- lib/dapp/kube/cli/command/kube/chart_create.rb
 - lib/dapp/kube/cli/command/kube/deploy.rb
 - lib/dapp/kube/cli/command/kube/dismiss.rb
 - lib/dapp/kube/cli/command/kube/minikube_setup.rb
+- lib/dapp/kube/cli/command/kube/secret_edit.rb
 - lib/dapp/kube/cli/command/kube/secret_extract.rb
 - 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/client.rb
-- lib/dapp/kube/client/error.rb
+- lib/dapp/kube/dapp/command/chart_create.rb
 - lib/dapp/kube/dapp/command/common.rb
 - lib/dapp/kube/dapp/command/deploy.rb
 - lib/dapp/kube/dapp/command/dismiss.rb
 - lib/dapp/kube/dapp/command/minikube_setup.rb
+- lib/dapp/kube/dapp/command/secret_edit.rb
 - lib/dapp/kube/dapp/command/secret_extract.rb
 - lib/dapp/kube/dapp/command/secret_generate.rb
 - lib/dapp/kube/dapp/command/secret_key_generate.rb
@@ -644,6 +647,16 @@ files:
 - lib/dapp/kube/error/base.rb
 - lib/dapp/kube/error/command.rb
 - lib/dapp/kube/error/kubernetes.rb
+- lib/dapp/kube/kubernetes.rb
+- lib/dapp/kube/kubernetes/client.rb
+- lib/dapp/kube/kubernetes/client/error.rb
+- lib/dapp/kube/kubernetes/client/resource/base.rb
+- lib/dapp/kube/kubernetes/client/resource/job.rb
+- lib/dapp/kube/kubernetes/client/resource/pod.rb
+- lib/dapp/kube/kubernetes/manager/base.rb
+- lib/dapp/kube/kubernetes/manager/container.rb
+- lib/dapp/kube/kubernetes/manager/job.rb
+- lib/dapp/kube/kubernetes/manager/pod.rb
 - lib/dapp/kube/secret.rb
 - lib/dapp/prctl.rb
 - lib/dapp/version.rb

data/lib/dapp/kube/client.rb

@@ -1,241 +0,0 @@
-module Dapp
-  module Kube
-    class Client
-      def initialize(namespace: nil)
-        @namespace = namespace
-        @query_parameters = {}
-      end
-
-      def namespace
-        @namespace || kube_context_config['context']['namespace'] || 'default'
-      end
-
-      # Чтобы не перегружать методы явной передачей namespace.
-      # Данный метод может пригодиться только в ситуации, когда надо указать другой namespace,
-      # в большинстве случаев используется namespace из конструктора.
-      def with_namespace(namespace, &blk)
-        old_namespace = @namespace
-        begin
-          @namespace = namespace
-          return yield
-        ensure
-          @namespace = old_namespace
-        end
-      end
-
-      def with_query(query, &blk)
-        old_query = @query_parameters
-        begin
-          @query_parameters = query
-          return yield
-        ensure
-          @query_parameters = old_query
-        end
-      end
-
-      # NOTICE: Название метода аналогично kind'у выдаваемого результата.
-      # NOTICE: В данном случае в результате kind=DeploymentList.
-      # NOTICE: Методы создания/обновления/удаления сущностей kubernetes заканчиваются на '!'. Например, create_deployment!.
-
-      {
-        '/api/v1' => [:service, :replicationcontroller, :pod],
-        '/apis/extensions/v1beta1' => [:deployment, :replicaset],
-        '/apis/batch/v1' => [:job]
-      }.each do |api, objects|
-        objects.each do |object|
-          define_method :"#{object}_list" do |**query_parameters|
-            request!(:get, "#{api}/namespaces/#{namespace}/#{object}s", **query_parameters)
-          end
-
-          define_method object do |name, **query_parameters|
-            request!(:get, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", **query_parameters)
-          end
-
-          define_method "#{object}_status" do |name, **query_parameters|
-            request!(:get, "#{api}/namespaces/#{namespace}/#{object}s/#{name}/status", **query_parameters)
-          end
-
-          define_method :"create_#{object}!" do |spec, **query_parameters|
-            request!(:post, "#{api}/namespaces/#{namespace}/#{object}s", body: spec, **query_parameters)
-          end
-
-          define_method :"replace_#{object}!" do |name, spec, **query_parameters|
-            request!(:put, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", body: spec, **query_parameters)
-          end
-
-          define_method :"delete_#{object}!" do |name, **query_parameters|
-            request!(:delete, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", **query_parameters)
-          end
-
-          define_method :"delete_#{object}s!" do |**query_parameters|
-            request!(:delete, "#{api}/namespaces/#{namespace}/#{object}s", **query_parameters)
-          end
-
-          define_method :"#{object}?" do |name, **query_parameters|
-            public_send(:"#{object}_list", **query_parameters)['items'].map { |item| item['metadata']['name'] }.include?(name)
-          end
-        end
-      end
-
-      def namespace_list(**query_parameters)
-        request!(:get, '/api/v1/namespaces', **query_parameters)
-      end
-
-      def namespace?(name, **query_parameters)
-        namespace_list(**query_parameters)['items'].map { |item| item['metadata']['name'] }.include?(name)
-      end
-
-      def create_namespace!(name, **query_parameters)
-        request!(:post, '/api/v1/namespaces', body: { metadata: { name: name } }, **query_parameters)
-      end
-
-      def delete_namespace!(name, **query_parameters)
-        request!(:delete, "/api/v1/namespaces/#{name}", **query_parameters)
-      end
-
-      def pod_log(name, follow: false, **query_parameters, &blk)
-        excon_parameters = follow ? { response_block: blk } : {}
-        request!(:get,
-                 "/api/v1/namespaces/#{namespace}/pods/#{name}/log",
-                 excon_parameters: excon_parameters,
-                 **{ follow: follow }.merge(query_parameters))
-      rescue Excon::Error::Timeout
-        raise Error::Timeout
-      end
-
-      def event_list(**query_parameters)
-        request!(:get, "/api/v1/namespaces/#{namespace}/events", **query_parameters)
-      end
-
-      protected
-
-      # query_parameters — соответствует 'Query Parameters' в документации kubernetes
-      # excon_parameters — соответствует опциям Excon
-      # body — hash для http-body, соответствует 'Body Parameters' в документации kubernetes, опционален
-      def request!(method, path, body: nil, excon_parameters: {}, **query_parameters)
-        with_connection(excon_parameters: excon_parameters) do |conn|
-          request_parameters = {method: method, path: path, query: @query_parameters.merge(query_parameters)}
-          request_parameters[:body] = JSON.dump(body) if body
-          load_body! conn.request(request_parameters), request_parameters
-        end
-      end
-
-      def load_body!(response, request_parameters)
-        response_ok = response.status.to_s.start_with? '2'
-
-        if response_ok
-          JSON.parse(response.body)
-        else
-          err_data = {}
-          err_data[:response_http_status] = response.status
-          if response_body = (JSON.parse(response.body) rescue nil)
-            err_data[:response_body] = response_body
-          else
-            err_data[:response_raw_body] = response.body
-          end
-          err_data[:request_parameters] = request_parameters
-
-          if response.status.to_s.start_with? '5'
-            raise Error::Base, code: :server_error, data: err_data
-          elsif response.status.to_s == '404'
-            raise Error::NotFound, data: err_data
-          else not response.status.to_s.start_with? '2'
-            raise Error::Base, code: :bad_request, data: err_data
-          end
-        end
-      end
-
-      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
-          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
-
-          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_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_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
-        @kube_config ||= begin
-          if File.exist?((kube_config_path = File.join(ENV['HOME'], '.kube/config')))
-            YAML.load_file(kube_config_path)
-          else
-            raise Error::Base, code: :kube_config_not_found, data: { path: kube_config_path }
-          end
-        end
-      end
-    end
-  end
-end