dapp 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6570b7b1469e193e6f8ff6f6af3aa14b209859e7
-  data.tar.gz: d3c5e800a04f70a35ca60a5a91dd83c026c5862a
+  metadata.gz: 19d9262efa88dcc95e63826c17a15ceaeabcf417
+  data.tar.gz: edd444ed3ee8f5c2f3360fa00f81cb4ee54704fc
 SHA512:
-  metadata.gz: b9ce968a3bb3bcb5ae8e41a1baa09a6f60b62600aca223887aa007a90ca3fbdf90ba2990c2b3e24c87a2ff0c77491d7a2a0d6e1e5ccb3e01eb88e352550be68f
-  data.tar.gz: 4fd1fae4d99bec6b86f818c0e43991d4d14354db0fa30a1e177820cbbba43e12f430128aa06594a4ec2ce5713eed695d97beea4d5407bead8923b678b790dd06
+  metadata.gz: 5f33daa8ff9806a7fcf8772daa91c4293f1376463dd60a491d50e27606b472280a881eda12c352f5adc5b9cd14ab45bd8c90731d3629c1533368c18a03311243
+  data.tar.gz: 161dad188386797eb8882af58119778b166ebc476a2bb4023ea5cfb6a745dd2847f53ad61b76671f4ff2cdccae28f69bba084de489fc9b78af6df7c569ef3262

data/config/en/net_status.yml

@@ -38,6 +38,7 @@ en:
       values_file_not_found: "Values file `%{path}` not found!"
       secret_values_file_not_found: "Secret values file `%{path}` not found!"
       user_containers_detected: "User containers have been using images!\n%{ids}"
+      incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"

data/lib/dapp.rb

@@ -40,6 +40,8 @@ require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
 require 'dapp/cli/command/base'
+require 'dapp/cli/command/update'
+require 'dapp/cli/cli'
 require 'dapp/config/directive/base'
 require 'dapp/config/config'
 require 'dapp/config/error/config'
@@ -112,6 +114,7 @@ require 'dapp/kube/cli/command/kube/dismiss'
 require 'dapp/kube/cli/command/kube/secret_key_generate'
 require 'dapp/kube/cli/command/kube/secret_generate'
 require 'dapp/kube/cli/command/kube/secret_extract'
+require 'dapp/kube/cli/command/kube/secret_regenerate'
 require 'dapp/kube/cli/command/kube/minikube_setup'
 require 'dapp/kube/cli/cli'
 require 'dapp/kube/dapp/command/common'
@@ -120,6 +123,7 @@ require 'dapp/kube/dapp/command/dismiss'
 require 'dapp/kube/dapp/command/secret_key_generate'
 require 'dapp/kube/dapp/command/secret_generate'
 require 'dapp/kube/dapp/command/secret_extract'
+require 'dapp/kube/dapp/command/secret_regenerate'
 require 'dapp/kube/dapp/command/minikube_setup'
 require 'dapp/kube/dapp/dapp'
 require 'dapp/kube/secret'

data/lib/dapp/cli.rb

@@ -5,7 +5,7 @@ module Dapp
     extend Helper::Cli
     include Helper::Trivia
 
-    SUBCOMMANDS = ['dimg', 'deployment', 'kube'].freeze
+    SUBCOMMANDS = ['dimg', 'deployment', 'kube', 'update'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp subcommand [subcommand options]
@@ -15,6 +15,7 @@ Available subcommands: (for details, dapp SUB-COMMAND --help)
 dapp dimg
 dapp deployment
 dapp kube
+dapp update
 
 Options:
 BANNER

data/lib/dapp/cli/cli.rb

@@ -0,0 +1 @@
+::Dapp::CLI.send(:include, ::Dapp::CLI::Command)

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

@@ -0,0 +1,14 @@
+module Dapp
+  class CLI
+    module Command
+      class Update < ::Dapp::CLI
+        def run(_argv)
+          spec = Gem::Specification.find do |s|
+            File.fnmatch(File.join(s.full_gem_path, '*'), __FILE__)
+          end
+          Gem.install(spec.name, spec.version.approximate_recommendation)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dapp/logging/base.rb

@@ -46,9 +46,7 @@ module Dapp
 
         def log_step_with_indent(step)
           log_step(step)
-          with_log_indent do
-            yield
-          end
+          with_log_indent { yield }
         end
 
         def log_step(*args, **kwargs)
@@ -96,12 +94,6 @@ module Dapp
           end.join
         end
 
-        def log_with_indent(message = '', **kwargs)
-          with_log_indent do
-            log(message, **kwargs)
-          end
-        end
-
         def with_log_indent(with = true)
           log_indent_next if with
           yield

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

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

data/lib/dapp/deployment/dapp/command/apply.rb

@@ -11,66 +11,54 @@ module Dapp
             validate_tag_name!(image_version)
 
             log_process("Applying deployment #{deployment.name}") do
-              with_log_indent do
-                deployment.kube.delete_unknown_resources!
+              deployment.kube.delete_unknown_resources!
 
-                deployment.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
-                  next if deployment.kube.pod_succeeded?(name)
-                  deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
-                  log_process(:bootstrap) do
-                    with_log_indent do
-                      deployment.kube.run_job!(spec, name)
-                    end
-                  end
+              deployment.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
+                next if deployment.kube.pod_succeeded?(name)
+                deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
+                log_process(:bootstrap) do
+                  deployment.kube.run_job!(spec, name)
                 end
+              end
 
-                deployment.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
-                  log_process(:before_apply_job) do
-                    deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
-                    with_log_indent do
-                      deployment.kube.run_job!(spec, name)
-                    end
-                  end
+              deployment.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
+                log_process(:before_apply_job) do
+                  deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
+                  deployment.kube.run_job!(spec, name)
                 end
+              end
 
-                deployment.apps.each do |app|
-                  log_process("Applying app #{app.name}") do
-                    with_log_indent do
-                      (app.kube.existing_deployments_names - app.to_kube_deployments(repo, image_version).keys).each do |deployment_name|
-                        app.kube.delete_deployment!(deployment_name)
-                      end
+              deployment.apps.each do |app|
+                log_process("Applying app #{app.name}") do
+                  (app.kube.existing_deployments_names - app.to_kube_deployments(repo, image_version).keys).each do |deployment_name|
+                    app.kube.delete_deployment!(deployment_name)
+                  end
 
-                      (app.kube.existing_services_names - app.to_kube_services.keys).each do |service_name|
-                        app.kube.delete_service!(service_name)
-                      end
+                  (app.kube.existing_services_names - app.to_kube_services.keys).each do |service_name|
+                    app.kube.delete_service!(service_name)
+                  end
 
-                      app.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
-                        next if app.kube.pod_succeeded?(name)
-                        app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
-                        log_process(:bootstrap) do
-                          with_log_indent do
-                            app.kube.run_job!(spec, name)
-                          end
-                        end
-                      end
+                  app.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
+                    next if app.kube.pod_succeeded?(name)
+                    app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
+                    log_process(:bootstrap) do
+                      app.kube.run_job!(spec, name)
+                    end
+                  end
 
-                      app.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
-                        log_process(:before_apply_job) do
-                          app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
-                          with_log_indent do
-                            app.kube.run_job!(spec, name)
-                          end
-                        end
-                      end
+                  app.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
+                    log_process(:before_apply_job) do
+                      app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
+                      app.kube.run_job!(spec, name)
+                    end
+                  end
 
-                      app.to_kube_deployments(repo, image_version).each do |name, spec|
-                        app.kube.apply_deployment!(name, spec)
-                      end
+                  app.to_kube_deployments(repo, image_version).each do |name, spec|
+                    app.kube.apply_deployment!(name, spec)
+                  end
 
-                      app.to_kube_services.each do |name, spec|
-                        app.kube.apply_service!(name, spec)
-                      end
-                    end
+                  app.to_kube_services.each do |name, spec|
+                    app.kube.apply_service!(name, spec)
                   end
                 end
               end

data/lib/dapp/deployment/kube_app.rb

@@ -75,16 +75,14 @@ module Dapp
       end
 
       def _dump_service_info(srv)
-        app.deployment.dapp.with_log_indent do
-          app.deployment.dapp.log_info("type: #{srv['spec']['type']}")
-          app.deployment.dapp.log_info("clusterIP: #{srv['spec']['clusterIP']}")
+        app.deployment.dapp.log_info("type: #{srv['spec']['type']}")
+        app.deployment.dapp.log_info("clusterIP: #{srv['spec']['clusterIP']}")
 
-          srv['spec'].fetch('ports', []).each do |port|
-            app.deployment.dapp.log_info("Port #{port['port']}:")
-            app.deployment.dapp.with_log_indent do
-              %w(protocol targetPort nodePort).each do |field_name|
-                app.deployment.dapp.log_info("#{field_name}: #{_field_value_for_log(port[field_name])}")
-              end
+        srv['spec'].fetch('ports', []).each do |port|
+          app.deployment.dapp.log_info("Port #{port['port']}:")
+          app.deployment.dapp.with_log_indent do
+            %w(protocol targetPort nodePort).each do |field_name|
+              app.deployment.dapp.log_info("#{field_name}: #{_field_value_for_log(port[field_name])}")
             end
           end
         end
@@ -118,125 +116,123 @@ module Dapp
       # NOTICE: является одним из критериев завершения ожидания на данный момент.
       def _wait_for_deployment(d, old_d_revision: nil)
         app.deployment.dapp.log_process("Waiting for kubernetes Deployment #{d['metadata']['name']} readiness") do
-          app.deployment.dapp.with_log_indent do
-            known_events_by_pod = {}
+          known_events_by_pod = {}
 
-            loop do
-              d_revision = d.fetch('metadata', {}).fetch('annotations', {}).fetch('deployment.kubernetes.io/revision', nil)
+          loop do
+            d_revision = d.fetch('metadata', {}).fetch('annotations', {}).fetch('deployment.kubernetes.io/revision', nil)
 
-              app.deployment.dapp.log_step("[#{Time.now}] Poll kubernetes Deployment status")
-              app.deployment.dapp.with_log_indent do
-                app.deployment.dapp.log_info("Target replicas: #{_field_value_for_log(d['spec']['replicas'])}")
-                app.deployment.dapp.log_info("Updated replicas: #{_field_value_for_log(d['status']['updatedReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
-                app.deployment.dapp.log_info("Available replicas: #{_field_value_for_log(d['status']['availableReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
-                app.deployment.dapp.log_info("Ready replicas: #{_field_value_for_log(d['status']['readyReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
-                app.deployment.dapp.log_info("Old deployment.kubernetes.io/revision: #{_field_value_for_log(old_d_revision)}")
-                app.deployment.dapp.log_info("Current deployment.kubernetes.io/revision: #{_field_value_for_log(d_revision)}")
-              end
+            app.deployment.dapp.log_step("[#{Time.now}] Poll kubernetes Deployment status")
+            app.deployment.dapp.with_log_indent do
+              app.deployment.dapp.log_info("Target replicas: #{_field_value_for_log(d['spec']['replicas'])}")
+              app.deployment.dapp.log_info("Updated replicas: #{_field_value_for_log(d['status']['updatedReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
+              app.deployment.dapp.log_info("Available replicas: #{_field_value_for_log(d['status']['availableReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
+              app.deployment.dapp.log_info("Ready replicas: #{_field_value_for_log(d['status']['readyReplicas'])} / #{_field_value_for_log(d['spec']['replicas'])}")
+              app.deployment.dapp.log_info("Old deployment.kubernetes.io/revision: #{_field_value_for_log(old_d_revision)}")
+              app.deployment.dapp.log_info("Current deployment.kubernetes.io/revision: #{_field_value_for_log(d_revision)}")
+            end
 
-              rs = nil
-              if d_revision
-                # Находим актуальный, текущий ReplicaSet.
-                # Если такая ситуация, когда есть несколько подходящих по revision ReplicaSet, то берем старейший по дате создания.
-                # Также делает kubectl: https://github.com/kubernetes/kubernetes/blob/d86a01570ba243e8d75057415113a0ff4d68c96b/pkg/controller/deployment/util/deployment_util.go#L664
-                rs = app.deployment.kubernetes.replicaset_list['items']
-                  .select do |_rs|
-                    Array(_rs['metadata']['ownerReferences']).any? do |owner_reference|
-                      owner_reference['uid'] == d['metadata']['uid']
-                    end
+            rs = nil
+            if d_revision
+              # Находим актуальный, текущий ReplicaSet.
+              # Если такая ситуация, когда есть несколько подходящих по revision ReplicaSet, то берем старейший по дате создания.
+              # Также делает kubectl: https://github.com/kubernetes/kubernetes/blob/d86a01570ba243e8d75057415113a0ff4d68c96b/pkg/controller/deployment/util/deployment_util.go#L664
+              rs = app.deployment.kubernetes.replicaset_list['items']
+                .select do |_rs|
+                  Array(_rs['metadata']['ownerReferences']).any? do |owner_reference|
+                    owner_reference['uid'] == d['metadata']['uid']
                   end
-                  .select do |_rs|
-                    rs_revision = _rs.fetch('metadata', {}).fetch('annotations', {}).fetch('deployment.kubernetes.io/revision', nil)
-                    (rs_revision and (d_revision == rs_revision))
-                  end
-                  .sort_by do |_rs|
-                    Time.parse _rs['metadata']['creationTimestamp']
-                  end.first
-              end
+                end
+                .select do |_rs|
+                  rs_revision = _rs.fetch('metadata', {}).fetch('annotations', {}).fetch('deployment.kubernetes.io/revision', nil)
+                  (rs_revision and (d_revision == rs_revision))
+                end
+                .sort_by do |_rs|
+                  Time.parse _rs['metadata']['creationTimestamp']
+                end.first
+            end
 
-              if rs
-                # Pod'ы связанные с активным ReplicaSet
-                rs_pods = app.deployment.kubernetes
-                  .pod_list(labelSelector: labels.map{|k, v| "#{k}=#{v}"}.join(','))['items']
-                  .select do |pod|
-                    Array(pod['metadata']['ownerReferences']).any? do |owner_reference|
-                      owner_reference['uid'] == rs['metadata']['uid']
-                    end
+            if rs
+              # Pod'ы связанные с активным ReplicaSet
+              rs_pods = app.deployment.kubernetes
+                .pod_list(labelSelector: labels.map{|k, v| "#{k}=#{v}"}.join(','))['items']
+                .select do |pod|
+                  Array(pod['metadata']['ownerReferences']).any? do |owner_reference|
+                    owner_reference['uid'] == rs['metadata']['uid']
                   end
+                end
 
-                app.deployment.dapp.with_log_indent do
-                  app.deployment.dapp.log_info("Pods:") if rs_pods.any?
-
-                  rs_pods.each do |pod|
-                    app.deployment.dapp.with_log_indent do
-                      app.deployment.dapp.log_info("* #{pod['metadata']['name']}")
+              app.deployment.dapp.with_log_indent do
+                app.deployment.dapp.log_info("Pods:") if rs_pods.any?
 
-                      known_events_by_pod[pod['metadata']['name']] ||= []
-                      pod_events = app.deployment.kubernetes
-                        .event_list(fieldSelector: "involvedObject.uid=#{pod['metadata']['uid']}")['items']
-                        .reject do |event|
-                          known_events_by_pod[pod['metadata']['name']].include? event['metadata']['uid']
-                        end
+                rs_pods.each do |pod|
+                  app.deployment.dapp.with_log_indent do
+                    app.deployment.dapp.log_info("* #{pod['metadata']['name']}")
 
-                      if pod_events.any?
-                        pod_events.each do |event|
-                          app.deployment.dapp.with_log_indent do
-                            app.deployment.dapp.log_info("[#{event['metadata']['creationTimestamp']}] #{event['message']}")
-                          end
-                          known_events_by_pod[pod['metadata']['name']] << event['metadata']['uid']
-                        end
+                    known_events_by_pod[pod['metadata']['name']] ||= []
+                    pod_events = app.deployment.kubernetes
+                      .event_list(fieldSelector: "involvedObject.uid=#{pod['metadata']['uid']}")['items']
+                      .reject do |event|
+                        known_events_by_pod[pod['metadata']['name']].include? event['metadata']['uid']
                       end
 
-                      ready_condition = pod['status'].fetch('conditions', {}).find {|condition| condition['type'] == 'Ready'}
-                      next if (not ready_condition) or (ready_condition['status'] == 'True')
-
-                      if ready_condition['reason'] == 'ContainersNotReady'
-                        Array(pod['status']['containerStatuses']).each do |container_status|
-                          next if container_status['ready']
-
-                          waiting_reason = container_status.fetch('state', {}).fetch('waiting', {}).fetch('reason', nil)
-                          case waiting_reason
-                          when 'ImagePullBackOff', 'ErrImagePull'
-                            raise Error::Base,
-                              code: :image_not_found,
-                              data: {app: app.name,
-                                     pod_name: pod['metadata']['name'],
-                                     reason: container_status['state']['waiting']['reason'],
-                                     message: container_status['state']['waiting']['message']}
-                          when 'CrashLoopBackOff'
-                            raise Error::Base,
-                              code: :container_crash,
-                              data: {app: app.name,
-                                     pod_name: pod['metadata']['name'],
-                                     reason: container_status['state']['waiting']['reason'],
-                                     message: container_status['state']['waiting']['message']}
-                          end
-                        end
-                      else
+                    if pod_events.any?
+                      pod_events.each do |event|
                         app.deployment.dapp.with_log_indent do
-                          app.deployment.dapp.log_warning("Unknown pod readiness condition reason '#{ready_condition['reason']}': #{ready_condition}")
+                          app.deployment.dapp.log_info("[#{event['metadata']['creationTimestamp']}] #{event['message']}")
                         end
+                        known_events_by_pod[pod['metadata']['name']] << event['metadata']['uid']
                       end
-                    end # with_log_indent
-                  end # rs_pods.each
-                end # with_log_indent
-              end
+                    end
 
-              break if begin
-                d_revision and
-                  d['spec']['replicas'] and
-                    d['status']['updatedReplicas'] and
-                      d['status']['availableReplicas'] and
-                        d['status']['readyReplicas'] and
-                          (d['status']['updatedReplicas'] >= d['spec']['replicas']) and
-                            (d['status']['availableReplicas'] >= d['spec']['replicas']) and
-                              (d['status']['readyReplicas'] >= d['spec']['replicas'])
-              end
+                    ready_condition = pod['status'].fetch('conditions', {}).find {|condition| condition['type'] == 'Ready'}
+                    next if (not ready_condition) or (ready_condition['status'] == 'True')
+
+                    if ready_condition['reason'] == 'ContainersNotReady'
+                      Array(pod['status']['containerStatuses']).each do |container_status|
+                        next if container_status['ready']
+
+                        waiting_reason = container_status.fetch('state', {}).fetch('waiting', {}).fetch('reason', nil)
+                        case waiting_reason
+                        when 'ImagePullBackOff', 'ErrImagePull'
+                          raise Error::Base,
+                            code: :image_not_found,
+                            data: {app: app.name,
+                                   pod_name: pod['metadata']['name'],
+                                   reason: container_status['state']['waiting']['reason'],
+                                   message: container_status['state']['waiting']['message']}
+                        when 'CrashLoopBackOff'
+                          raise Error::Base,
+                            code: :container_crash,
+                            data: {app: app.name,
+                                   pod_name: pod['metadata']['name'],
+                                   reason: container_status['state']['waiting']['reason'],
+                                   message: container_status['state']['waiting']['message']}
+                        end
+                      end
+                    else
+                      app.deployment.dapp.with_log_indent do
+                        app.deployment.dapp.log_warning("Unknown pod readiness condition reason '#{ready_condition['reason']}': #{ready_condition}")
+                      end
+                    end
+                  end # with_log_indent
+                end # rs_pods.each
+              end # with_log_indent
+            end
 
-              sleep 1
-              d = app.deployment.kubernetes.deployment(d['metadata']['name'])
+            break if begin
+              d_revision and
+                d['spec']['replicas'] and
+                  d['status']['updatedReplicas'] and
+                    d['status']['availableReplicas'] and
+                      d['status']['readyReplicas'] and
+                        (d['status']['updatedReplicas'] >= d['spec']['replicas']) and
+                          (d['status']['availableReplicas'] >= d['spec']['replicas']) and
+                            (d['status']['readyReplicas'] >= d['spec']['replicas'])
             end
-          end # with_log_indent
+
+            sleep 1
+            d = app.deployment.kubernetes.deployment(d['metadata']['name'])
+          end
         end
       end
 

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -50,11 +50,7 @@ module Dapp
           def artifacts_dimgs_build!
             artifacts.each do |artifact|
               process = dimg.dapp.t(code: 'process.artifact_building', data: { name: artifact[:name] })
-              dimg.dapp.log_secondary_process(process) do
-                dimg.dapp.with_log_indent do
-                  artifact[:dimg].build!
-                end
-              end
+              dimg.dapp.log_secondary_process(process) { artifact[:dimg].build! }
             end
           end
 

data/lib/dapp/dimg/dapp/command/build_context/export.rb

@@ -6,10 +6,8 @@ module Dapp
           module Export
             def build_context_export
               log_process(:'export context') do
-                with_log_indent do
-                  export_build_context_image_tar
-                  export_build_context_build_tar
-                end
+                export_build_context_image_tar
+                export_build_context_build_tar
               end
             end
 

data/lib/dapp/dimg/dapp/command/build_context/import.rb

@@ -9,10 +9,8 @@ module Dapp
                                     data: { path: build_context_path } unless build_context_path.exist?
 
               log_process(:'import context') do
-                with_log_indent do
-                  import_build_context_build_tar
-		              import_build_context_image_tar
-                end
+                import_build_context_build_tar
+                import_build_context_image_tar
               end
             end
 

data/lib/dapp/dimg/dimg.rb

@@ -85,9 +85,7 @@ module Dapp
           dapp.lock("image.#{hashsum image_name}") do
             ::Dapp::Dimg::Image::Stage.cache_reset(image_name)
             dapp.log_process(image_name, process: dapp.t(code: 'status.process.pushing')) do
-              dapp.with_log_indent do
-                image.export!(image_name)
-              end
+              image.export!(image_name)
             end
           end
         end

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', 'deploy', 'dismiss', 'secret extract', 'minikube setup'].freeze
+      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret regenerate', 'deploy', 'dismiss', 'secret extract', 'minikube setup'].freeze
 
       banner <<BANNER.freeze
 Usage: dapp kube subcommand [subcommand options]
@@ -13,6 +13,7 @@ Available subcommands: (for details, dapp kube SUB-COMMAND --help)
   dapp kube secret key generate [options]
   dapp kube secret generate [FILE_PATH] [options]
   dapp kube secret extract [FILE_PATH] [options]
+  dapp kube secret regenerate [SECRET_VALUES_FILE_PATH ...] [options]
   dapp kube minikube setup
 
 Options:

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

@@ -11,11 +11,21 @@ BANNER
 
       option :output_file_path,
              short: '-o OUTPUT_FILE_PATH',
+             description: 'Output file',
              required: false
 
+      option :values,
+             long: '--values',
+             description: 'Decode secret values file',
+             default: false
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        file_path = cli_arguments.empty? ? nil : cli_arguments.first
+        file_path = begin
+          if cli_options[:values] || !cli_arguments.empty?
+            self.class.required_argument(self, 'FILE_PATH')
+          end
+        end
         ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
       end
     end

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

@@ -13,6 +13,11 @@ BANNER
              short: '-o OUTPUT_FILE_PATH',
              required: false
 
+      option :values,
+             long: '--values',
+             description: 'Decode secret values file',
+             default: false
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = cli_arguments.empty? ? nil : cli_arguments.first

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

@@ -0,0 +1,23 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class SecretRegenerate < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube secret regenerate [SECRET_VALUES_FILE_PATH ...] [options]
+
+Options:
+BANNER
+
+      option :old_secret_key,
+             long: '--old-secret-key KEY',
+             description: 'Old secret key',
+             required: true
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, *cli_arguments)
+      end
+    end
+  end
+end

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

@@ -15,6 +15,30 @@ module Dapp
             kubernetes.namespace
           end
 
+          def kube_helm_encode_json(secret, json)
+            encode_json = proc do |value|
+              case value
+              when Array then value.map { |v| encode_json.call(v) }
+              when Hash then kube_helm_encode_json(secret,value)
+              else
+                secret.nil? ? '' : secret.generate(value)
+              end
+            end
+            json.each { |k, v| json[k] = encode_json.call(v) }
+          end
+
+          def kube_helm_decode_json(secret, json)
+            decode_value = proc do |value|
+              case value
+              when Array then value.map { |v| decode_value.call(v) }
+              when Hash then kube_helm_decode_json(secret,value)
+              else
+                secret.nil? ? '' : secret.extract(value)
+              end
+            end
+            json.each { |k, v| json[k] = decode_value.call(v) }
+          end
+
           def secret_key_should_exist!
             raise(Error::Command,
               code: :secret_key_not_found,
@@ -22,6 +46,10 @@ module Dapp
             ) if secret.nil?
           end
 
+          def kube_chart_path(*path)
+            self.path('.helm', *path).expand_path
+          end
+
           def secret
             @secret ||= begin
               unless secret_key = ENV['DAPP_SECRET_KEY']

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

@@ -54,23 +54,11 @@ module Dapp
 
           def kube_helm_decode_secret_values
             kube_secret_values_paths.each_with_index do |secret_values_file, index|
-              decoded_data = kube_helm_decode_json(YAML::load(secret_values_file.read))
+              decoded_data = kube_helm_decode_json(secret, YAML::load(secret_values_file.read))
               kube_tmp_chart_secret_values_paths[index].write(decoded_data.to_yaml)
             end
           end
 
-          def kube_helm_decode_json(json)
-            decode_value = proc do |value|
-              case value
-              when Array then value.map { |v| decode_value.call(v) }
-              when Hash then kube_helm_decode_json(value)
-              else
-                secret.nil? ? '' : secret.extract(value)
-              end
-            end
-            json.each { |k, v| json[k] = decode_value.call(v) }
-          end
-
           def kube_helm_decode_secret_files
             return unless kube_chart_secret_path.directory?
             Dir.glob(kube_chart_secret_path.join('**/*')).each do |entry|
@@ -206,10 +194,6 @@ module Dapp
           def kube_chart_secret_path(*path)
             kube_chart_path('secret', *path).expand_path
           end
-
-          def kube_chart_path(*path)
-            self.path('.helm', *path).expand_path
-          end
         end
       end
     end

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

@@ -7,10 +7,8 @@ module Dapp
             kube_check_helm!
             kube_check_helm_release!
             log_process("Delete release #{kube_release_name}") do
-              with_log_indent do
-                shellout! "helm delete #{kube_release_name} --purge"
-                kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]
-              end
+              shellout! "helm delete #{kube_release_name} --purge"
+              kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]
             end
           end
 

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

@@ -55,7 +55,15 @@ module Dapp
           end
 
           def _minikube_run_daemon(name, &blk)
-            pid_file_path = "/run/dapp_#{name}_daemon.pid"
+            uid = Process.euid
+            if uid != 0 && File.exists?("/run/user/#{uid}")
+              pid_file_path = "/run/user/#{uid}/dapp_#{name}_daemon.pid"
+            elsif uid != 0
+              pid_file_path = "/tmp/dapp_#{name}_daemon.pid"
+            else
+              pid_file_path = "/run/dapp_#{name}_daemon.pid"
+            end
+
             old_daemon_pid = begin
               File.open(pid_file_path, 'r').read.strip.to_i
             rescue Errno::ENOENT
@@ -126,99 +134,97 @@ module Dapp
           def _minikube_run_registry
             log_process("Run registry") do
               _minikube_kubernetes.with_query(gracePeriodSeconds: 0) do
-                with_log_indent do
-                  if _minikube_kubernetes.replicationcontroller? _minikube_registry_replicationcontroller_spec['metadata']['name']
-                    _minikube_kubernetes.delete_replicationcontroller! _minikube_registry_replicationcontroller_spec['metadata']['name']
-
-                    shutdown_ok = false
-                    600.times do
-                      unless _minikube_kubernetes.replicationcontroller? _minikube_registry_replicationcontroller_spec['metadata']['name']
-                        shutdown_ok = true
-                        break
-                      end
-                      sleep 1
-                    end
-                    raise MinikubeSetupError, code: :registry_replicationcontroller_shutdown_failed unless shutdown_ok
-                  end
+                if _minikube_kubernetes.replicationcontroller? _minikube_registry_replicationcontroller_spec['metadata']['name']
+                  _minikube_kubernetes.delete_replicationcontroller! _minikube_registry_replicationcontroller_spec['metadata']['name']
 
-                  _minikube_kubernetes.delete_pods! labelSelector: 'k8s-app=kube-registry'
                   shutdown_ok = false
                   600.times do
-                    unless _minikube_find_registry_pod
+                    unless _minikube_kubernetes.replicationcontroller? _minikube_registry_replicationcontroller_spec['metadata']['name']
                       shutdown_ok = true
                       break
                     end
                     sleep 1
                   end
-                  raise MinikubeSetupError, code: :registry_pod_shutdown_failed unless shutdown_ok
+                  raise MinikubeSetupError, code: :registry_replicationcontroller_shutdown_failed unless shutdown_ok
+                end
 
-                  if _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
-                    _minikube_kubernetes.delete_service! _minikube_registry_service_spec['metadata']['name']
-
-                    shutdown_ok = false
-                    600.times do
-                      unless _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
-                        shutdown_ok = true
-                        break
-                      end
-                      sleep 1
-                    end
-                    raise MinikubeSetupError, code: :registry_service_shutdown_failed unless shutdown_ok
+                _minikube_kubernetes.delete_pods! labelSelector: 'k8s-app=kube-registry'
+                shutdown_ok = false
+                600.times do
+                  unless _minikube_find_registry_pod
+                    shutdown_ok = true
+                    break
                   end
+                  sleep 1
+                end
+                raise MinikubeSetupError, code: :registry_pod_shutdown_failed unless shutdown_ok
 
-                  if _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
-                    _minikube_kubernetes.delete_pod! _minikube_registry_proxy_pod_spec['metadata']['name']
-
-                    shutdown_ok = false
-                    600.times do
-                      unless _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
-                        shutdown_ok = true
-                        break
-                      end
-                      sleep 1
-                    end
-                    raise MinikubeSetupError, code: :registry_proxy_pod_shutdown_failed unless shutdown_ok
-                  end
+                if _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
+                  _minikube_kubernetes.delete_service! _minikube_registry_service_spec['metadata']['name']
 
-                  _minikube_kubernetes.create_replicationcontroller!(_minikube_registry_replicationcontroller_spec)
-                  registry_pod_ok = false
+                  shutdown_ok = false
                   600.times do
-                    if registry_pod = _minikube_find_registry_pod
-                      if registry_pod['status']['phase'] == 'Running'
-                        registry_pod_ok = true
-                        @_minikube_registry_pod_name = registry_pod['metadata']['name']
-                        break
-                      end
+                    unless _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
+                      shutdown_ok = true
+                      break
                     end
                     sleep 1
                   end
-                  raise MinikubeSetupError, code: :registry_pod_not_ok unless registry_pod_ok
+                  raise MinikubeSetupError, code: :registry_service_shutdown_failed unless shutdown_ok
+                end
+
+                if _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
+                  _minikube_kubernetes.delete_pod! _minikube_registry_proxy_pod_spec['metadata']['name']
 
-                  _minikube_kubernetes.create_service!(_minikube_registry_service_spec)
-                  registry_service_ok = false
+                  shutdown_ok = false
                   600.times do
-                    if _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
-                      registry_service_ok = true
+                    unless _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
+                      shutdown_ok = true
                       break
                     end
                     sleep 1
                   end
-                  raise MinikubeSetupError, code: :registry_service_not_ok unless registry_service_ok
+                  raise MinikubeSetupError, code: :registry_proxy_pod_shutdown_failed unless shutdown_ok
+                end
 
-                  _minikube_kubernetes.create_pod! _minikube_registry_proxy_pod_spec
-                  registry_proxy_pod_ok = false
-                  600.times do
-                    if _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
-                      registry_proxy_pod = _minikube_kubernetes.pod(_minikube_registry_proxy_pod_spec['metadata']['name'])
-                      if registry_proxy_pod['status']['phase'] == 'Running'
-                        registry_proxy_pod_ok = true
-                        break
-                      end
+                _minikube_kubernetes.create_replicationcontroller!(_minikube_registry_replicationcontroller_spec)
+                registry_pod_ok = false
+                600.times do
+                  if registry_pod = _minikube_find_registry_pod
+                    if registry_pod['status']['phase'] == 'Running'
+                      registry_pod_ok = true
+                      @_minikube_registry_pod_name = registry_pod['metadata']['name']
+                      break
+                    end
+                  end
+                  sleep 1
+                end
+                raise MinikubeSetupError, code: :registry_pod_not_ok unless registry_pod_ok
+
+                _minikube_kubernetes.create_service!(_minikube_registry_service_spec)
+                registry_service_ok = false
+                600.times do
+                  if _minikube_kubernetes.service? _minikube_registry_service_spec['metadata']['name']
+                    registry_service_ok = true
+                    break
+                  end
+                  sleep 1
+                end
+                raise MinikubeSetupError, code: :registry_service_not_ok unless registry_service_ok
+
+                _minikube_kubernetes.create_pod! _minikube_registry_proxy_pod_spec
+                registry_proxy_pod_ok = false
+                600.times do
+                  if _minikube_kubernetes.pod? _minikube_registry_proxy_pod_spec['metadata']['name']
+                    registry_proxy_pod = _minikube_kubernetes.pod(_minikube_registry_proxy_pod_spec['metadata']['name'])
+                    if registry_proxy_pod['status']['phase'] == 'Running'
+                      registry_proxy_pod_ok = true
+                      break
                     end
-                    sleep 1
                   end
-                  raise MinikubeSetupError, code: :registry_proxy_pod_not_ok unless registry_proxy_pod_ok
+                  sleep 1
                 end
+                raise MinikubeSetupError, code: :registry_proxy_pod_not_ok unless registry_proxy_pod_ok
               end
             end
           end

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

@@ -6,10 +6,25 @@ module Dapp
           def kube_secret_extract(file_path)
             secret_key_should_exist!
 
-            if file_path.nil?
-              kube_extract_secret
+            data = begin
+              if file_path
+                raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+
+                if options[:values]
+                  kube_extract_secret_values(file_path)
+                else
+                  kube_extract_secret_file(file_path)
+                end
+              else
+                kube_extract_secret
+              end
+            end
+
+            if (output_file_path = options[:output_file_path])
+              FileUtils.mkpath File.dirname(output_file_path)
+              IO.binwrite(output_file_path, "#{data}\n")
             else
-              kube_extract_secret_file(file_path)
+              puts data
             end
           end
 
@@ -17,27 +32,26 @@ module Dapp
             data = begin
               if $stdin.tty?
                 print 'Enter secret: '
-                $stdin.noecho(&:gets).tap { print "\n" }
+                $stdin.gets
               else
                 $stdin.read
-              end
+              end.to_s.chomp
             end
 
-            unless (data = data.to_s.chomp).empty?
-              puts secret.extract(data)
+            if data.empty?
+              exit 0
+            else
+              secret.extract(data)
             end
           end
 
-          def kube_extract_secret_file(file_path)
-            raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+          def kube_extract_secret_values(file_path)
+            raise Error::Command, code: :incorrect_yaml_structure, data: { path: File.expand_path(file_path) } unless (json = YAML::load(File.read(file_path)))
+            kube_helm_decode_json(secret, json).to_yaml
+          end
 
-            decrypted_data = secret.extract(IO.binread(file_path).chomp("\n"))
-            if (output_file_path = options[:output_file_path]).nil?
-              puts decrypted_data
-            else
-              FileUtils.mkpath File.dirname(output_file_path)
-              IO.binwrite(output_file_path, "#{decrypted_data}\n")
-            end
+          def kube_extract_secret_file(file_path)
+            secret.extract(IO.binread(file_path).chomp("\n"))
           end
         end
       end

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

@@ -6,10 +6,25 @@ module Dapp
           def kube_secret_generate(file_path)
             secret_key_should_exist!
 
-            if file_path.nil?
-              kube_secret
+            data = begin
+              if file_path
+                raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+
+                if options[:values]
+                  kube_secret_values(file_path)
+                else
+                  kube_secret_file(file_path)
+                end
+              else
+                kube_secret
+              end
+            end
+
+            if (output_file_path = options[:output_file_path])
+              FileUtils.mkpath File.dirname(output_file_path)
+              IO.binwrite(output_file_path, "#{data}\n")
             else
-              kube_secret_file(file_path)
+              puts data
             end
           end
 
@@ -20,24 +35,23 @@ module Dapp
                 $stdin.noecho(&:gets).tap { print "\n" }
               else
                 $stdin.read
-              end
+              end.to_s.chomp
             end
 
-            unless (data = data.to_s.chomp).empty?
-              puts secret.generate(data)
+            if data.empty?
+              exit 0
+            else
+              secret.generate(data)
             end
           end
 
-          def kube_secret_file(file_path)
-            raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+          def kube_secret_values(file_path)
+            raise Error::Command, code: :incorrect_yaml_structure, data: { path: File.expand_path(file_path) } unless (json = YAML::load(File.read(file_path)))
+            kube_helm_encode_json(secret, json).to_yaml
+          end
 
-            encrypted_data = secret.generate(IO.binread(file_path))
-            if (output_file_path = options[:output_file_path]).nil?
-              puts encrypted_data
-            else
-              FileUtils.mkpath File.dirname(output_file_path)
-              IO.binwrite(output_file_path, "#{encrypted_data}\n")
-            end
+          def kube_secret_file(file_path)
+            secret.generate(IO.binread(file_path))
           end
         end
       end

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

@@ -0,0 +1,39 @@
+module Dapp
+  module Kube
+    module Dapp
+      module Command
+        module SecretRegenerate
+          def kube_secret_regenerate(*secret_values_paths)
+            regenerated_data = {}
+
+            secret_values_paths << kube_chart_path('secret-values.yaml') if kube_chart_path('secret-values.yaml').file?
+            secret_values_paths.each do |file_path|
+              raise Error::Command, code: :file_not_exist, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+              regenerated_data[file_path] = kube_regenerate_secret_values(file_path)
+            end
+
+            Dir.glob(kube_chart_path('secret/**/*'), File::FNM_DOTMATCH).each do |file_path|
+              next if File.directory?(file_path)
+              regenerated_data[file_path] = kube_regenerate_secret_file(file_path)
+            end
+
+            regenerated_data.each { |file_path, data| IO.binwrite(file_path, "#{data}\n") }
+          end
+
+          def kube_regenerate_secret_file(file_path)
+            secret.generate(old_secret.extract(IO.binread(file_path).chomp("\n")))
+          end
+
+          def kube_regenerate_secret_values(file_path)
+            raise Error::Command, code: :incorrect_yaml_structure, data: { path: File.expand_path(file_path) } unless (json = YAML::load(File.read(file_path)))
+            kube_helm_encode_json(secret, kube_helm_decode_json(old_secret, json)).to_yaml
+          end
+
+          def old_secret
+            @old_secret ||= Secret.new(options[:old_secret_key])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Dapp
         include Command::SecretKeyGenerate
         include Command::SecretGenerate
         include Command::SecretExtract
+        include Command::SecretRegenerate
         include Command::MinikubeSetup
         include Command::Common
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.4'.freeze
+  VERSION = '0.13.5'.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.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -403,7 +403,9 @@ files:
 - config/en/net_status.yml
 - lib/dapp.rb
 - lib/dapp/cli.rb
+- lib/dapp/cli/cli.rb
 - lib/dapp/cli/command/base.rb
+- lib/dapp/cli/command/update.rb
 - lib/dapp/config/config.rb
 - lib/dapp/config/directive/base.rb
 - lib/dapp/config/error/config.rb
@@ -627,6 +629,7 @@ files:
 - 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/common.rb
@@ -636,6 +639,7 @@ files:
 - 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
+- lib/dapp/kube/dapp/command/secret_regenerate.rb
 - lib/dapp/kube/dapp/dapp.rb
 - lib/dapp/kube/error/base.rb
 - lib/dapp/kube/error/command.rb