dapp 0.31.28 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8ebac81727c3e8d93b59c8280debe5840335d660b82661f746ce23e47b93c5
-  data.tar.gz: b08f280aac5796e0c111978ad49ab8599494bb7ed9fef10631983d69055aa159
+  metadata.gz: 7836539f8a917786c4db7778853720687f41b3dc80eaaddee4b7e9cf13a7e8f5
+  data.tar.gz: 84eec391c97ddebb98732b6dc8729f606a7cbbb2c5eaf1c4b398e4a22de30736
 SHA512:
-  metadata.gz: bcf4a19562edc68ec3ddc62c3c0625efa0121c801b48b17e4489e59e4227f798c5f8efd376481c64f9f4e90702f3309171490100e7f6549277a16bb466a3252e
-  data.tar.gz: 956c8743e2be5841f084e44ad8f318bd60088dd950fb11430bd3220479d8fa824e49217b53a85039df28483a03ef17bfdc5eab514fdc0e26a899ad77a54bc4c0
+  metadata.gz: e44e256557b647a045f379df38c06f88ad2911a49e691112e3ce3d970ccc4afcf8f09d2f0381478924f41560d50c58bd8fb66ce97951a4a68ae280548ef70e70
+  data.tar.gz: 37d984525171b58ba24a6ea18a208b87f4e50de784ed8098958c9df0c2eb9893cc3b12ec95b4f2d17ebde90c7785299dd563f1c9168dbc0f8e02aefda1d3b108

data/bin/dapp

@@ -74,29 +74,7 @@ set_gitlab_cancel_handler if ENV["GITLAB_CI"]
 begin
   begin
     begin
-      begin
-        Dapp::CLI.new.run
-      ensure
-        if Time.now.to_date < Date.parse("2019-11-01")
-          STDERR.puts
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                   DEPRECATION WARNING!                      ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp will be deprecated for use starting with 01.11.2019!  ###", :red, :bold]
-          STDERR.puts ::Paint["###            Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                     https://werf.io                         ###", :red, :bold]
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts
-        else
-          STDERR.puts
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                     DEPRECATION WARNING!                       ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp is deprecated for use and will not receive any support!  ###", :red, :bold]
-          STDERR.puts ::Paint["###               Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                       https://werf.io                          ###", :red, :bold]
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts
-        end
-      end
+      Dapp::CLI.new.run
     rescue Dapp::Error::Base => e
       unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
         $stderr.puts(message)

data/lib/dapp/dapp/dappfile.rb

@@ -126,12 +126,12 @@ module Dapp
           return if File.exists? dappfile_yml_bin_path
 
           log_process("Downloading dappfile-yml dapp dependency") do
-            location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml")
+            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml")
 
             tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
             ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
 
-            checksum_location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml.sha")
+            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
             tmp_bin_checksum_path = tmp_bin_path + ".checksum"
             ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
 

data/lib/dapp/dapp/sentry.rb

@@ -50,7 +50,6 @@ module Dapp
           "build-dir" => self.build_dir,
           "options" => self.options,
           "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
             "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
             "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
             "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],

data/lib/dapp/dimg/builder/ansible.rb

@@ -138,7 +138,9 @@ module Dapp
 
         define_method("#{stage}_checksum") do
           checksum_args = []
-          checksum_args << JSON.dump(stage_config(stage)['tasks']) unless stage_config(stage)['tasks'].empty?
+          (dimg.config._ansible[stage.to_s] || []).each do |task|
+            checksum_args << JSON.dump(task["config"])
+          end
           checksum_args << public_send("#{stage}_version_checksum")
           _checksum checksum_args
         end

data/lib/dapp/dimg/builder/base.rb

@@ -74,8 +74,8 @@ module Dapp
       end
 
       def _checksum(*args)
-        return if args.flatten.compact.delete_if { |val| val.respond_to?(:empty?) && val.empty? }.empty?
-        dimg.hashsum args
+        return if (format_args = args.flatten.compact.delete_if { |val| val.respond_to?(:empty?) && val.empty? }).empty?
+        dimg.hashsum format_args
       end
     end # Builder::Base
   end # Dimg

data/lib/dapp/dimg/config/directive/shell/dimg.rb

@@ -25,7 +25,7 @@ module Dapp
 
               define_method "_#{stage}_version" do
                 return [] if (variable = instance_variable_get("@_#{stage}")).nil?
-                variable._version || _version
+                variable._version
               end
             end
             [:before_install, :before_setup, :install, :setup].each(&method(:stage_command_generator))

data/lib/dapp/dimg/dapp/command/cleanup_repo.rb

@@ -3,8 +3,8 @@ module Dapp
     module Dapp
       module Command
         module CleanupRepo
-          DATE_POLICY = Time.now.to_i - 60 * 60 * 24 * 30
           GIT_TAGS_LIMIT_POLICY = 10
+          EXPIRY_DATE_PERIOD_POLICY = 60 * 60 * 24 * 30
 
           def cleanup_repo
             lock_repo(repo = option_repo) do
@@ -87,36 +87,56 @@ module Dapp
             %w(git_tag git_commit).each_with_object([]) do |scheme, dimgs_images|
               dimgs_images.concat begin
                 detailed_dimgs_images_by_scheme[scheme].select do |dimg|
-                  !dry_run? && begin
-                    if scheme == 'git_tag'
-                      consistent_git_tags.include?(dimg[:tag])
-                    elsif scheme == 'git_commit'
-                      git_own_repo.commit_exists?(dimg[:tag])
-                    end
+                  if scheme == 'git_tag'
+                    consistent_git_tags.include?(dimg[:tag])
+                  elsif scheme == 'git_commit'
+                    git_own_repo.commit_exists?(dimg[:tag])
                   end
                 end
               end
             end.tap do |detailed_dimgs_images|
               sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }.reverse
               expired_dimgs_images, not_expired_dimgs_images = sorted_detailed_dimgs_images.partition do |dimg_image|
-                dimg_image[:created_at] < DATE_POLICY
+                dimg_image[:created_at] < expiry_date_policy
               end
 
-              log_step_with_indent(:"date policy (before #{DateTime.strptime(DATE_POLICY.to_s, '%s')})") do
+              log_step_with_indent(:"date policy (before #{DateTime.strptime(expiry_date_policy.to_s, '%s')})") do
                 expired_dimgs_images.each { |dimg| delete_repo_image(registry, dimg) }
               end
 
               {}.tap do |images_by_dimg|
                 not_expired_dimgs_images.each { |dimg| (images_by_dimg[dimg[:dimg]] ||= []) << dimg }
                 images_by_dimg.each do |dimg, images|
-                  log_step_with_indent(:"limit policy (> #{GIT_TAGS_LIMIT_POLICY}) (`#{dimg}`)") do
-                    images[GIT_TAGS_LIMIT_POLICY..-1].each { |dimg| delete_repo_image(registry, dimg) }
-                  end unless images[GIT_TAGS_LIMIT_POLICY..-1].nil?
+                  log_step_with_indent(:"limit policy (> #{git_tag_limit_policy}) (`#{dimg || "nameless"}` dimg)") do
+                    images[git_tag_limit_policy..-1].each { |dimg| delete_repo_image(registry, dimg) }
+                  end unless images[git_tag_limit_policy..-1].nil?
                 end
               end
             end
           end
 
+          def expiry_date_policy
+            @expiry_date_policy = begin
+              expiry_date_period_policy = policy_value('EXPIRY_DATE_PERIOD_POLICY', default: EXPIRY_DATE_PERIOD_POLICY)
+              Time.now.to_i - expiry_date_period_policy
+            end
+          end
+
+          def git_tag_limit_policy
+            @git_tag_limit_policy ||= policy_value('GIT_TAGS_LIMIT_POLICY', default: GIT_TAGS_LIMIT_POLICY)
+          end
+
+          def policy_value(env_key, default:)
+            return default if (val = ENV[env_key]).nil?
+
+            if val.to_i.to_s == val
+              val.to_i
+            else
+              log_warning("WARNING: `#{env_key}` value `#{val}` is ignored (using default value `#{default}`)!")
+              default
+            end
+          end
+
           def git_tag_by_consistent_git_tag(consistent_git_tag)
             git_tag_by_consistent_tag_name[consistent_git_tag]
           end
@@ -180,65 +200,59 @@ module Dapp
           # pod items[] spec containers[] image
           def pod_images(client)
             client.pod_list['items'].map do |item|
-              images_from_pod_spec(item)
+              item['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # cronjob items[] spec jobTemplate spec template spec containers[] image
           def cronjob_images(client)
             client.cronjob_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['jobTemplate']['spec']['template'])
+              item['spec']['jobTemplate']['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # daemonsets   items[] spec template spec containers[] image
           def daemonset_images(client)
             client.daemonset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # deployment   items[] spec template spec containers[] image
           def deployment_images(client)
             client.deployment_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # job          items[] spec template spec containers[] image
           def job_images(client)
             client.job_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # replicasets  items[] spec template spec containers[] image
           def replicaset_images(client)
             client.replicaset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
            # replicasets  items[] spec template spec containers[] image
            def statefulset_images(client)
             client.statefulset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # replicationcontroller    items[] spec template spec containers[] image
           def replicationcontroller_images(client)
             client.replicationcontroller_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
-          def images_from_pod_spec(pod_spec)
-            containers = Array(pod_spec['spec']['containers'])
-            initContainers = Array(pod_spec['spec']['initContainers'])
-            (containers + initContainers).map { |cont| cont['image'] }
-          end
-
           def without_kube?
             !!options[:without_kube]
           end

data/lib/dapp/dimg/dapp/dappfile.rb

@@ -40,4 +40,4 @@ module Dapp
       end # Dappfile
     end # Dapp
   end # Dimg
-end # Dapp
+end # Dapp

data/lib/dapp/dimg/dimg.rb

@@ -145,6 +145,7 @@ module Dapp
 
       def build_export_image!(image_name, scheme_name:)
         Image::Dimg.image_by_name(name: image_name, from: last_stage.image, dapp: dapp).tap do |export_image|
+          export_image.untag! if export_image.built?
           export_image.add_service_change_label(:'dapp-tag-scheme' => scheme_name)
           export_image.add_service_change_label(:'dapp-dimg' => true)
           export_image.build!

data/lib/dapp/dimg/docker_registry/base/authorization.rb

@@ -29,25 +29,10 @@ module Dapp
             [:realm, :service, :scope].map do |option|
               /#{option}="([[^"].]*)/ =~ header
               next unless Regexp.last_match(1)
-
-              option_value = begin
-                if option == :scope
-                  handle_scope_option(Regexp.last_match(1))
-                else
-                  Regexp.last_match(1)
-                end
-              end
-
-              [option, option_value]
+              [option, Regexp.last_match(1)]
             end.compact.to_h
           end
 
-          def handle_scope_option(resourcescope)
-            resource_type, resource_name, actions = resourcescope.split(":")
-            actions                               = actions.split(",").map { |action| action == "delete" ? "*" : action }.join(",")
-            [resource_type, resource_name, actions].join(":")
-          end
-
           def authorization_auth
             @authorization_auth ||= begin
               if ::Dapp::Dapp.options_with_docker_credentials?

data/lib/dapp/helper/sha256.rb

@@ -13,7 +13,7 @@ module Dapp
       end
 
       def sha256(arg)
-        Digest::SHA256.hexdigest Array(arg).compact.map(&:to_s).join(':::')
+        Digest::SHA256.hexdigest Array(arg).flatten.compact.map(&:to_s).join(':::')
       end
     end
   end # Helper

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

@@ -35,12 +35,6 @@ module Dapp
           '/apis/batch/v1' => [:job, ],
           '/apis/batch/v1beta1' => [:cronjob, ],
         },
-        '1.11' => {
-          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
-          '/apis/apps/v1' => [:daemonset, :deployment, :replicaset, :statefulset, ],
-          '/apis/batch/v1' => [:job, ],
-          '/apis/batch/v1beta1' => [:cronjob, ],
-        },
         'stable' => {
           '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
           '/apis/batch/v1' => [:job, ],

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

@@ -50,11 +50,12 @@ module Dapp
 
               dapp.log_step("[#{Time.now}] Poll deployment '#{d.name}' status")
               dapp.with_log_indent do
-                dapp.log_info("Replicas: #{_field_value_for_log(d.status['replicas'])}")
-                dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])}")
-                dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])}")
-                dapp.log_info("Unavailable replicas: #{_field_value_for_log(d.status['unavailableReplicas'])}")
+                dapp.log_info("Target replicas: #{_field_value_for_log(d.replicas)}")
+                dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])} / #{_field_value_for_log(d.replicas)}")
+                dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])} / #{_field_value_for_log(d.replicas)}")
                 dapp.log_info("Ready replicas: #{_field_value_for_log(d.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
+                dapp.log_info("Old deployment.kubernetes.io/revision: #{_field_value_for_log(@revision_before_deploy)}")
+                dapp.log_info("Current deployment.kubernetes.io/revision: #{_field_value_for_log(d_revision)}")
               end
 
               rs = nil
@@ -83,16 +84,6 @@ module Dapp
               end
 
               if rs
-                dapp.with_log_indent do
-                  dapp.log_step("Current ReplicaSet '#{rs.name}' status")
-                  dapp.with_log_indent do
-                    dapp.log_info("Replicas: #{_field_value_for_log(rs.status['replicas'])}")
-                    dapp.log_info("Fully labeled replicas: #{_field_value_for_log(rs.status['fullyLabeledReplicas'])}")
-                    dapp.log_info("Available replicas: #{_field_value_for_log(rs.status['availableReplicas'])}")
-                    dapp.log_info("Ready replicas: #{_field_value_for_log(rs.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
-                  end
-                end
-
                 # Pod'ы связанные с активным ReplicaSet
                 rs_pods = dapp.kubernetes.pod_list['items']
                   .map {|spec| Kubernetes::Client::Resource::Pod.new(spec)}
@@ -177,14 +168,19 @@ module Dapp
                 end # with_log_indent
               end
 
-              # break only when rs is not nil
-
-              if d_revision && d.replicas && d.replicas == 0
-                break
-              end
-
-              if d_revision && d.replicas && rs
-                break if is_deployment_ready(d) && is_replicaset_ready(d, rs)
+              if d_revision && d.replicas
+                if d.replicas == 0
+                  break
+                else
+                  break if begin
+                    d.status['updatedReplicas'] &&
+                      d.status['availableReplicas'] &&
+                        d.status['readyReplicas'] &&
+                          (d.status['updatedReplicas'] >= d.replicas) &&
+                            (d.status['availableReplicas'] >= d.replicas) &&
+                              (d.status['readyReplicas'] >= d.replicas)
+                  end
+                end
               end
 
               sleep 5
@@ -193,14 +189,6 @@ module Dapp
           end
         end
 
-        def is_deployment_ready(d)
-          d.status.key?("readyReplicas") && d.status["readyReplicas"] >= d.replicas
-        end
-
-        def is_replicaset_ready(d, rs)
-          rs.status.key?("readyReplicas") && rs.status["readyReplicas"] >= d.replicas
-        end
-
         private
 
         def _field_value_for_log(value)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.28"
+  VERSION = "0.32.0"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.28
+  version: 0.32.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -234,14 +234,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell