dapp 0.28.10 → 0.28.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435bfad980694c0766403ee37dc76a22df40f9d1
-  data.tar.gz: 547eb74b7dfcd6da66ac0198ee88c4481238f7d3
+  metadata.gz: d0130f71c694d70d32d1f329980b26847245ffb4
+  data.tar.gz: 9484cf39d55e453047b4b7ecb2580e639e7ebdb7
 SHA512:
-  metadata.gz: 80568b12b3424f0d2565d0c0f3314ebca37b19d941af313ee5debbd5a871e55084effc0cee35fcd379867329f30a2b0714569e4ae8a19a832bcc95bfd2bcc05c
-  data.tar.gz: 1003e256b226c28f2742e92b8847cbf0181fca828530f7f36b342f3294896d7e054b846c4f121a878e1c2775374c88df76f0386754f704ae825a68fd45afd52d
+  metadata.gz: 77ee063a4d28ae842b23bf14263d8dafbbe13115bee7ee50c7698f4139628939275ec5b7450cd8b8f4940e08320e0747c4728f8f8a123f8ca979074d0242442f
+  data.tar.gz: 8331131d6dd438a3bde9e32e435e9595e7719e84a84bbaecf2735fc2488ac5c9ee6fa32b934bf4029115bc6a1b9ef1e6485b12941fca320855cdc4c9bb6bc103

data/lib/dapp/dimg/image/argument.rb

@@ -100,6 +100,8 @@ module Dapp
           return {} if from.nil?
           [:entrypoint, :cmd].each_with_object({}) do |option, options|
             options[option] = from.config_option(option.to_s.capitalize) || []
+          end.tap do |options|
+            options[:workdir] = Array(from.config_option('WorkingDir') || '/')
           end
         end
 
@@ -121,6 +123,7 @@ module Dapp
 
         def service_options
           {
+            workdir: '/',
             entrypoint: dapp.bash_bin,
             name: container_name,
             user: '0:0',

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

@@ -27,44 +27,9 @@ module Dapp
           end
 
           def kube_lint
-            kube_check_helm_chart!
             kube_check_helm_chart_yaml!
-
-            repo = option_repo
-
-            docker_tag = option_tags.first
-
             with_kube_tmp_lint_chart_dir do
-              kube_copy_chart
-              kube_generate_helm_chart_tpl
-              kube_helm_decode_secrets
-
-              all_values = {}
-              [kube_chart_path('values.yaml').expand_path, *kube_values_paths, *kube_tmp_chart_secret_values_paths].each do |values_path|
-                all_values = all_values.in_depth_merge(yaml_load_file(values_path)) if File.file?(values_path)
-              end
-
-              options[:helm_set_options].each do |opt_spec|
-                name, _, value = opt_spec.partition("=")
-                keys = name.split(".")
-
-                values = all_values
-                keys.each_with_index do |key, ind|
-                  if ind == keys.size - 1
-                    values[key] = YAML.load(value)
-                  else
-                    values[key] ||= {}
-                    values = values[key]
-                  end
-                end
-              end
-
-              service_values = Helm::Values.service_values_hash(self, repo, kube_namespace, docker_tag, fake: true)
-              all_values = all_values.in_depth_merge service_values
-
-              kube_chart_path_for_helm.join("values.yaml").write YAML.dump(all_values)
-
-              shellout! "helm lint --strict #{kube_chart_path_for_helm}"
+              helm_release(&:lint!)
             end
           end
 

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

@@ -59,7 +59,7 @@ module Dapp
           "--name #{name}",
           *helm_additional_values_options,
           *helm_set_options,
-          *helm_common_options,
+          *helm_install_options,
         ].join(" "))
 
         return cmd
@@ -70,7 +70,7 @@ module Dapp
           "helm upgrade #{name} #{chart_path}",
           *helm_additional_values_options,
           *helm_set_options,
-          *helm_common_options
+          *helm_install_options
         ].join(" "))
 
         return cmd
@@ -99,6 +99,18 @@ module Dapp
         end
       end
 
+      def lint!
+        dapp.shellout! [
+          'helm',
+          'lint',
+          '--strict',
+          *helm_additional_values_options,
+          *helm_set_options(fake: true),
+          *helm_common_options,
+          chart_path
+        ].compact.join(' ')
+      end
+
       protected
 
       def evaluation_output
@@ -137,23 +149,32 @@ module Dapp
         @dimg_registry ||= dapp.dimg_registry(repo)
       end
 
-      def helm_set_options(without_registry: false)
+      def helm_set_options(without_registry: false, fake: false)
         [].tap do |options|
           options.concat set.map {|opt| "--set #{opt}"}
 
-          service_values = Helm::Values.service_values(dapp, repo, namespace, docker_tag, without_registry: self.without_registry || without_registry)
+          service_values = Helm::Values.service_values(dapp, repo, namespace, docker_tag,
+                                                       without_registry: self.without_registry || without_registry,
+                                                       fake: fake)
           options.concat service_values.to_set_options
         end
       end
 
+      def helm_install_options(dry_run: nil)
+        dry_run = dapp.dry_run? if dry_run.nil?
+
+        helm_common_options(dry_run: dry_run).tap do |options|
+          options << '--dry-run' if dry_run
+          options << "--timeout #{deploy_timeout}" if deploy_timeout
+        end
+      end
+
       def helm_common_options(dry_run: nil)
         dry_run = dapp.dry_run? if dry_run.nil?
 
         [].tap do |options|
           options << "--namespace #{namespace}" if namespace
-          options << '--dry-run' if dry_run
-          options << '--debug'   if dry_run
-          options << "--timeout #{deploy_timeout}" if deploy_timeout
+          options << '--debug'                  if dry_run
         end
       end
     end # Helm::Release

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.28.10"
-  BUILD_CACHE_VERSION = 29
+  VERSION = "0.28.11"
+  BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.10
+  version: 0.28.11
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout