dapp 0.28.15 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1d02259edd4c7402cc5c4045163267c80068ee6d5c6b009b5d4e92337698f23d
-  data.tar.gz: 259f2703f896a8c04cefe1825853acde2a4e70788bcb47b6bc2a2e79626a0721
+SHA1:
+  metadata.gz: 72950bf823bbccdb2980f7977ab08c52a8a3b6ed
+  data.tar.gz: 282cac11557cd2ba2d74c3c4a9ebaa14e0a180f0
 SHA512:
-  metadata.gz: ce73fe4f3ef7dcf1b29d0bd869aec3d22ad21d9da21e52b7d15eccbf95adf39e723b5264d79591ad77e1dfcc49169abbef178fe3dcb8bc6ef3aed3731c5e81d8
-  data.tar.gz: eaf4cdd7513f42d7f8dad75e4d3874fb9b32b438d7df87e6daf865def9df869a4edc138133e8db45b4a08df669620feb078065a175979536aa316895999f77a5
+  metadata.gz: 5b8c11386bed98342ae40225a804295715d62e1eeb00ad26efe4aeb14eadc52bda5594f941219f0984a2fdb0da8aaac61ac3d730d487d494a7ffee04a4084f7b
+  data.tar.gz: 090755be90e39618a416b7a6cc4d106649bbcf4e3efead35e2293f20fabed3f003eaaadbd265d5acb9351940dddf8ba0571c9abf3cd32b7a1e2462596883e651

data/bin/dapp

@@ -10,29 +10,7 @@ Thread.abort_on_exception = true
 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/config/en/net_status.yml

@@ -126,7 +126,8 @@ en:
       commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
       branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
       rugged_protocol_not_supported: "Rugged has been compiled without support for `%{protocol}`.\nGit repositories will not be reachable via `%{protocol}` (`%{url}`).\nRugged.features should include `%{protocol}`."
-      incorrect_gitmodules_file: "Local git repo with invalid `.gitmodules` file: `%{error}`."
+      git_local_incorrect_gitmodules_params: "Local git repo with invalid `.gitmodules` file: %{error}"
+      incorrect_gitmodules_file: "Git repo `%{name}` with invalid `.gitmodules` file: %{error}\n\n%{content}"
       git_repository_without_remote_url: "Git repo `%{name}`: remote url cannot be detected!\nYou should check `remote origin url` in `%{path}` repository."
       git_repository_not_found: "Git repository `%{path}` not found!\nYou should check `remote origin url` in `%{parent_git_path}` repository."
     lock:

data/lib/dapp/dapp/dappfile.rb

@@ -61,7 +61,10 @@ module Dapp
             puts "-- DAPP_DUMP_CONFIG END"
           end
 
-          config
+          config.tap do
+            config.after_parsing!
+            config.validate!
+          end
         end # begin
       end
 
@@ -69,8 +72,6 @@ module Dapp
         ::Dapp::Config::Config.new(dapp: self).tap do |config|
           begin
             config.instance_eval File.read(dappfile_path), dappfile_path
-            config.after_parsing!
-            config.validate!
           rescue SyntaxError, StandardError => e
             backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }
             message = begin
@@ -114,6 +115,7 @@ module Dapp
 
         response = JSON.parse(raw_json_response)
 
+        log_warning(response["warning"]) unless response["warning"].empty?
         raise ::Dapp::Dapp::Error::DappfileYmlErrorResponse.new(response["error"], response) if response["error"]
 
         YAML.load response["dappConfig"]
@@ -124,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/build/stage/artifact_default.rb

@@ -32,6 +32,8 @@ module Dapp
           # rubocop:disable Metrics/ParameterLists
           def safe_cp(from, to, owner, group, include_paths = [], exclude_paths = [])
             ''.tap do |cmd|
+              cmd << "#{dimg.dapp.mkdir_bin} -p #{File.dirname(to)}"
+              cmd << ' && '
               cmd << dimg.dapp.rsync_bin
               cmd << ' --archive --links --inplace'
               cmd << " --chown=#{owner}:#{group}" if owner or group

data/lib/dapp/dimg/cli/command/dimg/bp.rb

@@ -40,11 +40,6 @@ BANNER
               boolean: true,
               default: false
 
-        option :force_save_cache,
-              long: '--force-save-cache',
-              boolean: true,
-              default: false
-
         # push options
 
         extend ::Dapp::CLI::Options::Tag

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -36,11 +36,6 @@ BANNER
                long: '--use-system-tar',
                boolean: true,
                default: false
-
-        option :force_save_cache,
-               long: '--force-save-cache',
-               boolean: true,
-               default: false
       end
     end
   end

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

@@ -62,16 +62,6 @@ module Dapp
               raise ::Dapp::Error::Config, code: :stage_artifact_double_associate,
                                            data: { stage: "#{type} #{stage.inspect}",
                                                    conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
-
-              defined_stage = public_send("_#{type}")
-              dapp.log_config_warning(
-                desc: {
-                  code: :stage_artifact_rewritten,
-                  context: :warning,
-                  data: { stage: "#{type} #{stage.inspect}",
-                          conflict_stage: "#{type} #{defined_stage.inspect}" }
-                }
-              ) if defined_stage
             end
           end
         end

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

@@ -72,7 +72,7 @@ module Dapp
               loop do
                 break if artifacts.empty?
                 verifiable_artifact = artifacts.shift
-                artifacts.select { |a| a[:to] == verifiable_artifact[:to] }.each do |artifact|
+                artifacts.each do |artifact|
                   next if verifiable_artifact[:index] == artifact[:index]
                   begin
                     validate_artifact!(verifiable_artifact, artifact)
@@ -87,54 +87,107 @@ module Dapp
 
             def conflict_between_artifacts!(*formatted_artifacts)
               artifacts = formatted_artifacts.flatten.map { |formatted_artifact| formatted_artifact[:related_artifact] }
-              dappfile_context = artifacts.map do |artifact|
-                artifact_directive = []
-                artifact_directive << begin
-                  if artifact.is_a? Artifact::Export
-                    "artifact.export('#{artifact._cwd}') do"
+              artifact_imports = []
+              git_artifacts    = []
+              artifacts.map do |artifact|
+                (artifact.is_a?(Artifact::Export) ? artifact_imports : git_artifacts) << artifact
+              end
+
+              common_artifact_dsl = proc do |a|
+                [].tap do |context|
+                  context << "  to '#{a._to}'"
+                  [:include_paths, :exclude_paths].each do |directive|
+                    next if (paths = a.send("_#{directive}")).empty?
+                    context << "  #{directive} '#{paths.join("', '")}'"
+                  end
+                end
+              end
+
+              import_dsl = proc do |ga|
+                [].tap do |context|
+                  context << "artifact.export('#{ga._cwd}') do"
+                  context.concat(common_artifact_dsl.call(ga))
+                  context << 'end'
+                end
+              end
+
+              git_artifact_dsl = proc do |ga|
+                [].tap do |context|
+                  context << "git#{"('#{ga._url}')" if ga.respond_to?(:_url)}.add('#{ga._cwd}') do"
+                  context.concat(common_artifact_dsl.call(ga))
+                  context << 'end'
+                end
+              end
+
+              common_artifact_yaml = proc do |a|
+                [].tap do |context|
+                  context << "  to: #{a._to}"
+                  {
+                    include_paths: 'includePaths',
+                    exclude_paths: 'excludePaths',
+                  }.each do |directive, yamlDirective|
+                    next if (paths = a.send("_#{directive}")).empty?
+                    context << "  #{yamlDirective}: [#{paths.join(", ")}]"
+                  end
+                end
+              end
+
+              import_yaml = proc do |a|
+                [].tap do |context|
+                  context << "- artifact: #{a._config._name}"
+                  context << "  add: #{a._cwd}"
+                  context.concat(common_artifact_yaml.call(a))
+                end
+              end
+
+              git_artifact_yaml = proc do |ga|
+                [].tap do |context|
+                  if ga.respond_to?(:_url)
+                    context << "- url: #{ga._url}"
+                    context << "  add: #{ga._cwd}"
                   else
-                    "git#{"('#{artifact._url}')" if artifact.respond_to?(:_url)}.add('#{artifact._cwd}') do"
+                    context << "- add: #{ga._cwd}"
                   end
+                  context.concat(common_artifact_yaml.call(ga))
                 end
-                [:include_paths, :exclude_paths].each do |directive|
-                  next if (paths = artifact.send("_#{directive}")).empty?
-                  artifact_directive << "  #{directive} '#{paths.join("', '")}'"
+              end
+
+              dappfile_context = [].tap do |msg|
+                if artifact_imports.count != 0
+                  if dapp
+                    artifact_imports.each { |a| msg.concat(import_dsl.call(a)) }
+                  else
+                    msg << 'import:'
+                    artifact_imports.each { |a| msg.concat(import_yaml.call(a)) }
+                  end
                 end
-                artifact_directive << "  to '#{artifact._to}'"
-                artifact_directive << 'end'
-                artifact_directive.join("\n")
-              end.join("\n\n")
+
+                if git_artifacts.count != 0
+                  if dapp
+                    git_artifacts.each { |a| msg.concat(git_artifact_dsl.call(a)) }
+                  else
+                    msg << 'git:'
+                    git_artifacts.each { |a| msg.concat(git_artifact_yaml.call(a)) }
+                  end
+                end
+              end.join("\n")
               raise ::Dapp::Error::Config, code: :artifact_conflict, data: { dappfile_context: dappfile_context }
             end
 
             def validate_artifact_format(artifacts)
               artifacts.map do |a|
-                path_format = proc { |path| File.expand_path(File.join('/', path, '/'))[1..-1] }
-                path_format.call(a._to) =~ %r{^([^\/]*)\/?(.*)$}
-
-                to = Regexp.last_match(1)
-                include_exclude_path_format = proc do |path|
-                  paths = [].tap do |arr|
-                    arr << Regexp.last_match(2) unless Regexp.last_match(2).empty?
-                    arr << path
-                  end
-                  path_format.call(File.join(*paths))
-                end
-
-                include_paths = [].tap do |arr|
-                  if a._include_paths.empty? && !Regexp.last_match(2).empty?
-                    arr << Regexp.last_match(2)
+                include_paths = begin
+                  if a._include_paths.empty?
+                    [a._to]
                   else
-                    arr.concat(a._include_paths.dup.map(&include_exclude_path_format))
+                    a._include_paths.dup.map { |p| File.join(a._to, p) }
                   end
                 end
-                exclude_paths = a._exclude_paths.dup.map(&include_exclude_path_format)
 
                 {
                   index: artifacts.index(a),
-                  to: to,
                   include_paths: include_paths,
-                  exclude_paths: exclude_paths,
+                  exclude_paths: a._exclude_paths.dup.map { |p| File.join(a._to, p) },
                   related_artifact: a
                 }
               end

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

@@ -14,7 +14,7 @@ module Dapp
             def export_build_context_image_tar
               lock("#{name}.images", readonly: true) do
                 context_images_names = build_configs.map do |config|
-                  dimg(config: config, ignore_git_fetch: true).tagged_images.map(&:name)
+                  dimg(config: config, ignore_git_fetch: true).all_tagged_images.map(&:name)
                 end.flatten
 
                 log_secondary_process(:images, short: true) do

data/lib/dapp/dimg/dimg.rb

@@ -59,7 +59,6 @@ module Dapp
       end
 
       def after_stages_build!
-        return unless last_stage.image.built? || dev_mode? || force_save_cache?
         last_stage.save_in_cache!
         artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
       end
@@ -87,6 +86,7 @@ module Dapp
               stage_image.export!(image_name)
             end
           end
+          artifacts.each { |artifact| artifact.export_stages!(repo, format: format) }
         end
       end
 
@@ -184,6 +184,7 @@ module Dapp
             end
             break unless !!dapp.options[:pull_all_stages]
           end
+          artifacts.each { |artifact| artifact.import_stages!(repo, format: format) }
         end
       end
 
@@ -241,14 +242,6 @@ module Dapp
         dapp.dev_mode?
       end
 
-      def force_save_cache?
-        if ENV.key? "DAPP_FORCE_SAVE_CACHE"
-          %w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
-        else
-          !!dapp.options[:force_save_cache]
-        end
-      end
-
       def build_cache_version
         [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
       end

data/lib/dapp/dimg/dimg/git_artifact.rb

@@ -12,7 +12,7 @@ module Dapp
             repo = GitRepo::Own.new(dapp)
             local_git_artifacts.map do |ga_config|
               artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options))
-            end
+            end unless repo.empty?
           end
         end
 
@@ -23,7 +23,7 @@ module Dapp
                                                    url: ga_config._url,
                                                    branch: ga_config._branch,
                                                    ignore_git_fetch: ignore_git_fetch)
-              artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options))
+              artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options)) unless repo.empty?
             end
           end
         end

data/lib/dapp/dimg/dimg/stages.rb

@@ -18,17 +18,8 @@ module Dapp
           dapp.stage_dapp_label
         end
 
-        def tagged_images
-          all_images.select(&:tagged?)
-        end
-        alias export_images tagged_images
-
-        def all_images
-          @all_images ||= all_stages.map(&:image).uniq!(&:name)
-        end
-
-        def all_stages
-          stages + artifacts.map(&:all_stages).flatten
+        def all_tagged_images
+          tagged_images.concat(artifacts.map(&:all_tagged_images).flatten).uniq(&:name)
         end
 
         def last_stage
@@ -53,8 +44,13 @@ module Dapp
           end
         end
 
+        def tagged_images
+          images.select(&:tagged?)
+        end
+        alias export_images tagged_images
+
         def import_images
-          all_images.select { |image| !image.tagged? }
+          images.select { |image| !image.tagged? }
         end
 
         def artifacts_stages
@@ -70,6 +66,10 @@ module Dapp
             end
           end
         end
+
+        def images
+          stages.map(&:image).uniq(&:name)
+        end
       end # Stages
     end # Mod
   end # Dimg

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/dimg/git_artifact.rb

@@ -48,7 +48,7 @@ module Dapp
       def submodule_artifact(submodule_params)
         embedded_artifact(submodule_params)
       rescue Rugged::InvalidError => e
-        raise Error::Rugged, code: :incorrect_gitmodules_file, data: { error: e.message }
+        raise Error::Rugged, code: :git_local_incorrect_gitmodules_params, data: { error: e.message }
       end
 
       def nested_git_directory_artifacts
@@ -90,7 +90,11 @@ module Dapp
 
         {}.tap do |options|
           options[:name]                = repo.dapp.consistent_uniq_slugify("embedded-#{embedded_rel_path}")
-          options[:cwd]                 = embedded_inherit_path(cwd, embedded_rel_path).last
+          options[:cwd]                 = begin
+            subpath = Pathname(cwd).subpath_of(embedded_rel_path)
+            subpath = '' if subpath == '.'
+            subpath
+          end
           options[:to]                  = Pathname(cwd).subpath_of?(embedded_rel_path) ? to : File.join(to, embedded_rel_path)
           options[:include_paths]       = embedded_inherit_paths(include_paths, embedded_rel_path)
           options[:exclude_paths]       = embedded_inherit_paths(exclude_paths, embedded_rel_path)
@@ -117,16 +121,22 @@ module Dapp
         path_parts      = path.split('/')
         test_path       = nil
         inherited_paths = []
+
         until path_parts.empty?
-          last_part_path = path_parts.shift
-          test_path      = [test_path, last_part_path].compact.join('/')
+          current_path_part = path_parts.shift
+          test_path         = [test_path, current_path_part].compact.join('/')
+
+          match = File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+          break unless match || File.fnmatch(File.join(test_path, '**'), embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
 
-          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
-          part_for_all = (last_part_path == '**')
+          any = (current_path_part == '**')
 
-          if non_match || part_for_all
-            inherited_paths << [last_part_path, path_parts].flatten.join('/')
-            break unless part_for_all
+          if any
+            inherited_paths << [current_path_part, path_parts].flatten.join('/')
+            inherited_paths << path_parts.join('/') unless path_parts.empty?
+          elsif match
+            inherited_paths << (path_parts.empty? ? '**' : path_parts.join('/'))
+            break
           end
         end
 

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

@@ -61,8 +61,7 @@ module Dapp
         end
 
         def submodules_params_base(gitsubmodule_content, paths: [], exclude_paths: [])
-          IniFile.new.parse(gitsubmodule_content)
-            .to_h
+          submodules_file_parse!(gitsubmodule_content)
             .select { |_, params| !ignore_directory?(params['path'], paths: paths, exclude_paths: exclude_paths) }
             .map do |_, params|
               params = params.symbolize_keys
@@ -73,6 +72,29 @@ module Dapp
             end
         end
 
+        def submodules_file_parse!(gitsubmodule_content)
+          raise_error = proc do |error_message|
+            raise Error::Rugged, code: :incorrect_gitmodules_file, data: { name: self.name,
+                                                                           error: error_message,
+                                                                           content: gitsubmodule_content.strip }
+          end
+
+          begin
+            IniFile.new.parse(gitsubmodule_content).to_h.tap do |submodules_params|
+              submodules_params.each do |name, params|
+                %w(path url).each do |field|
+                  next unless params[field].nil? || params[field].empty?
+                  raise_error.call("field `#{field}` required (#{name})")
+                end
+
+                raise_error.call("path should be relative (#{name})") unless Pathname(params['path']).relative?
+              end
+            end
+          rescue IniFile::Error => e
+            raise_error.call(e.message)
+          end
+        end
+
         def submodule_url(gitsubmodule_url)
           if gitsubmodule_url.start_with?('../')
             case remote_origin_url_protocol
@@ -178,6 +200,10 @@ module Dapp
           git.lookup(commit)
         end
 
+        def empty?
+          git.empty?
+        end
+
         protected
 
         def git(**kwargs)

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

@@ -30,7 +30,7 @@ module Dapp
 {{-   else }}
 - name: B
   value: value2
-{{-     if or (eq .Values.global.env "staging") (eq .Values.global.env "testing") }}
+{{-     if or (eq .Values.global.env "stage") (eq .Values.global.env "test") }}
 - name: C
   value: value3
 {{-     end }}
@@ -64,8 +64,7 @@ spec:
           secretName: {{ .Chart.Name }}-backend
       containers:
       - command: [ '/bin/bash', '-l', '-c', 'bundle exec ctl start' ]
-        image: {{ tuple "specific-name" . | include "dimg" }} # or nameless dimg {{ tuple . | include "dimg" }}
-        imagePullPolicy: Always
+{{ tuple "dimg-name" . | include "dapp_container_image" | indent 8 }} # or nameless dimg {{ tuple . | include "dapp_container_image" }}
         name: {{ .Chart.Name }}-backend
         livenessProbe:
           httpGet:
@@ -79,7 +78,7 @@ spec:
           name: http
           protocol: TCP
         env:
-{{- include "common_envs" . | indent 8 }}
+{{ tuple "dimg-name" . | include "dapp_container_env" | indent 10 }}
 ---
 apiVersion: v1
 kind: Service
@@ -101,4 +100,4 @@ spec:
       end
     end
   end
-end
+end

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

@@ -16,7 +16,8 @@ module Dapp
                 "name" => dapp.name,
                 "repo" => repo,
                 "docker_tag" => docker_tag,
-              }
+              },
+              "ci" => ENV.select { |k, _| k.start_with?("CI_") } ,
             }
           }
 

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/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.28.15"
+  VERSION = "0.29.0"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.15
+  version: 0.29.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2018-06-18 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
@@ -773,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell