dapp 0.35.38 → 0.35.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d26a11977954f4baee3c804c8812aa58665a200fcaedbf6ae95340d0165769
-  data.tar.gz: 6ba3b455e3638af9e07676a9fcb022d5d5817519d3c0938cbdacdcade2d31ad0
+  metadata.gz: cb323b17a1e387036a9f838500748d92721ef6521336570321218d4fff136391
+  data.tar.gz: 35ad68f1c7770cf03f593d7a79da490bba0e6ac1003174cdeb3d8b6bb1d6a4ba
 SHA512:
-  metadata.gz: bd4dd24c262618ab1a34c2cd7c6d8eb4223d4bd9c0991433fa5cf227cc77b3d08e07dad662170cb93365761acc57afb42b72f4a07455416d41ec01b89a3ff215
-  data.tar.gz: 5ca763ebff8c788267396f51d22d501ab5b5b211a6e648c0ebf3d8a16a30bf7f886335e3b70b757f2ed58b4c24939bf247654794beda325952673eb701c1573d
+  metadata.gz: d959200c31dd51ebab6aa03645de1a344ce2d799e4a40fc72e8911ac35de0713f0cdbc581e93a74c5611f941e86d4b6ba1defdce66497798f0398c91685c5573
+  data.tar.gz: 1feec282c7edc4a9b45b7538a008ddad33b8c03749353f0b0ef5af9b33253c1921bb5fa1ce6e43ddc9ee2a9e3490e573dc402c26080c69324bdf5c7f3a51901e

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

@@ -31,6 +31,7 @@ module Dapp
                   repo: repo,
                   docker_tag: tag,
                   namespace: kube_namespace,
+                  kube_context: custom_kube_context,
                   chart_path: kube_chart_path_for_helm,
                   set: self.options[:helm_set_options],
                   values: [*kube_values_paths, *kube_tmp_chart_secret_values_paths],
@@ -345,10 +346,12 @@ image: {{ tuple $name $context | include "_dimg2" }}
             options[:context]
           end
 
+          def custom_kube_context
+            ENV["KUBECONTEXT"] || context_option
+          end
+
           def kube_context
-            ENV["KUBECONTEXT"] ||
-              context_option ||
-                kubernetes_config.current_context_name
+            custom_kube_context || kubernetes_config.current_context_name
           end
 
           def kube_namespace

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

@@ -90,7 +90,12 @@ module Dapp
 
           def kube_run_deploy(release)
             log_process("Deploy release #{release.name}") do
-              helm_status_res = shellout("helm status #{release.name}")
+              helm_status_res = shellout([
+                "helm",
+                ("--kube-context #{custom_kube_context}" if custom_kube_context),
+                "status",
+                release.name,
+              ].compact.join(" "))
 
               release_status = nil
               if helm_status_res.status.success?
@@ -111,7 +116,12 @@ module Dapp
 
                 if File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
                   log_process("Purge helm release #{release.name}") do
-                    shellout!("helm delete --purge #{release.name}")
+                    shellout!([
+                      "helm",
+                      ("--kube-context #{custom_kube_context}" if custom_kube_context),
+                      "delete",
+                      "--purge #{release.name}",
+                    ].compact.join(" "))
                   end
 
                   # Purge-trigger file remains to exist
@@ -179,7 +189,8 @@ module Dapp
                                 "resourceName" => job.name,
                                 "namespace" => release.namespace,
                                 "timeout" => timeout,
-                                "logsFromTime" => kube_deploy_start_time
+                                "logsFromTime" => kube_deploy_start_time,
+                                "kubeContext" => custom_kube_context,
                               },
                               tmp_dir: tmp_dir,
                             )
@@ -268,7 +279,8 @@ module Dapp
                             "resourceName" => deployment_manager.name,
                             "namespace" => release.namespace,
                             "timeout" => timeout,
-                            "logsFromTime" => kube_deploy_start_time
+                            "logsFromTime" => kube_deploy_start_time,
+                            "kubeContext" => custom_kube_context,
                           )
 
                           if res["error"]

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

@@ -8,14 +8,24 @@ module Dapp
               kube_check_helm!
               kube_check_helm_release!
               log_process("Delete release #{kube_release_name}") do
-                shellout! "helm delete #{kube_release_name} --purge"
+                shellout!([
+                  "helm",
+                  ("--kube-context #{custom_kube_context}" if custom_kube_context),
+                  "delete",
+                  kube_release_name,
+                  "--purge",
+                ].compact.join(" "))
                 kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]
               end
             end
           end
 
           def kube_check_helm_release!
-            pr = shellout("helm list | grep #{kube_release_name}")
+            pr = shellout([
+              "helm",
+              ("--kube-context #{custom_kube_context}" if custom_kube_context),
+              "list | grep #{kube_release_name}"
+            ].compact.join(" "))
             raise ::Dapp::Error::Command, code: :helm_release_not_exist, data: { name: kube_release_name } if pr.status == 1 || pr.stdout.empty?
           end
         end

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

@@ -14,10 +14,11 @@ module Dapp
       attr_reader :values
       attr_reader :deploy_timeout
       attr_reader :without_registry
+      attr_reader :kube_context
 
       def initialize(dapp,
         name:, repo:, docker_tag:, namespace:, chart_path:,
-        set: [], values: [], deploy_timeout: nil, without_registry: nil)
+        set: [], values: [], deploy_timeout: nil, without_registry: nil, kube_context: nil)
         @dapp = dapp
 
         @name = name
@@ -29,6 +30,7 @@ module Dapp
         @values = values
         @deploy_timeout = deploy_timeout
         @without_registry = (without_registry.nil? ? false : without_registry)
+        @kube_context = kube_context
       end
 
       def jobs
@@ -60,6 +62,7 @@ module Dapp
           *helm_additional_values_options,
           *helm_set_options,
           *helm_install_options,
+          ("--kube-context #{kube_context}" if kube_context),
         ].join(" "))
 
         return cmd
@@ -70,7 +73,8 @@ module Dapp
           "helm upgrade #{name} #{chart_path}",
           *helm_additional_values_options,
           *helm_set_options,
-          *helm_install_options
+          *helm_install_options,
+          ("--kube-context #{kube_context}" if kube_context),
         ].join(" "))
 
         return cmd
@@ -107,6 +111,7 @@ module Dapp
           *helm_additional_values_options,
           *helm_set_options(fake: true),
           *helm_common_options,
+          ("--kube-context #{kube_context}" if kube_context),
           chart_path
         ].compact.join(' ')
       end
@@ -123,6 +128,7 @@ module Dapp
             helm_set_options(without_registry: true),
             ("--namespace #{namespace}" if namespace),
             "--name #{name}",
+            ("--kube-context #{kube_context}" if kube_context),
           ].compact.join(" ")
 
           cmd.stdout

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

@@ -32,11 +32,11 @@ module Dapp
           res["global"]["dapp"]["ci"] = ci_info
 
           if fake
-          elsif ENV["CI_COMMIT_TAG"]
-            ci_info["tag"] = ci_info["ref"] = ENV["CI_COMMIT_TAG"]
+          elsif commit_tag = (ENV["CI_BUILD_TAG"] || ENV["CI_COMMIT_TAG"])
+            ci_info["tag"] = ci_info["ref"] = commit_tag
             ci_info["is_tag"] = true
-          elsif ENV["CI_COMMIT_REF_NAME"]
-            ci_info["branch"] = ci_info["ref"] = ENV["CI_COMMIT_REF_NAME"]
+          elsif commit_ref_name = (ENV["CI_BUILD_REF_NAME"] || ENV["CI_COMMIT_REF_NAME"])
+            ci_info["branch"] = ci_info["ref"] = commit_ref_name
             ci_info["is_branch"] = true
           elsif dapp.git_own_repo_exist? and dapp.git_own_repo.head_branch_name != "HEAD"
             ci_info["branch"] = ci_info["ref"] = dapp.git_own_repo.head_branch_name

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.38"
+  VERSION = "0.35.39"
   BUILD_CACHE_VERSION = 33
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.38
+  version: 0.35.39
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout