kubes 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4943b1a730b2ab6d80a6de3128d6a55182a02f75c6ed176ab5bdc2eef9e080a
-  data.tar.gz: 0d30261fa44bb60fa61bc9d38ada888469caa27b42e09c19e59edbbed52ab190
+  metadata.gz: 1b2e59aafa5ea2023bdf23dc43ba38c5279dcd719c3db793eca0abf24c8e1da2
+  data.tar.gz: ed004f619cba70d0d6257ca9559b3fd1b1fa7cb6c48943c64c3abcb8cddf3d38
 SHA512:
-  metadata.gz: 3a17f532fa0b257a92b79fd1975c6d83ba0d7fc6f4d56c7e01f0937d9f64b16bae2e3637364acc258027f0c3fe434f1732221dedc8461587c45a9fcaea4c873b
-  data.tar.gz: 91e88038fcdfd9925567936c2a665d097ac739d2ebb17191526357bbd227336ffe57c389e946f44b6ce78ed27022901f2c78ee64f2aacdcbeda490a51d35e35a
+  metadata.gz: 7be4d6f0bd67e15b9ba3e3594f1b98d36c3fb5a4cc68c67fd603a75a973e4b90f8800a0a8fddf68951d0f3f09291c154bae5066830ec792aa167eb8675f5acca
+  data.tar.gz: 6187e6b6bc29e1a038f8c5a20530483a120cc6107854f718f8570648334f27cb7b4afb1a39d4d45ede4bb3cda97e8cc66d63c1cbbdde27a059997f65bd547704

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.4.7]
+- #33 improve switch context: earlier and only when needed
+
 ## [0.4.6]
 - #32 custom helpers support
 

data/docs/_docs/helpers/aws.md

@@ -12,3 +12,4 @@ List of AWS helpers:
 ## Notes
 
 * By default, `KubeGoogle.logger = Kubes.logger`. This means, you can set `logger.level = "debug"` in `.kubes/config.rb` to see more details.
+* The AWS helpers are provided by the [boltops-tools/kubes_aws](https://github.com/boltops-tools/kubes_aws) library.

data/docs/_docs/helpers/google.md

@@ -14,4 +14,4 @@ List of Google helpers:
 * By default, `KubeGoogle.logger = Kubes.logger`. This means, you can set `logger.level = "debug"` in `.kubes/config.rb` to see more details.
 * The `gcloud` cli is used to create IAM roles. So `gcloud` is required.
 * Note: Would like to use the google sdk, but it wasn't obvious how to do so. PRs are welcomed.
-
+* The Google helpers are provided by the [boltops-tools/kubes_google](https://github.com/boltops-tools/kubes_google) library.

data/docs/_docs/patterns/secrets.md

@@ -78,5 +78,3 @@ upcase | Automatically upcase the Kubernetes secret data keys. | false
 prefix | Prefixed used to list and filter Google secrets. IE: `projects/686010496118/secrets/demo-dev-`. Can also be set with the `GCP_SECRET_PREFIX` env variable. The env variable takes the highest precedence. | nil
 
 Note, Kubernetes secrets are only base64 encoded. So users who have access to read Kubernetes secrets will be able to decode and get the value trivially. Depending on your security posture requirements, this may or may not suffice.
-
-The Google helpers are provided by the [boltops-tools/kubes_google](https://github.com/boltops-tools/kubes_google) library. For more details, check out its README.

data/lib/kubes/kubectl.rb

@@ -17,13 +17,11 @@ module Kubes
       params = args.flatten.join(' ')
       args = "#{@name} #{params}" # @name: apply or delete
 
-      switch_context do
-        run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
-          if options[:capture]
-            self.class.capture(args, options) # already includes kubectl
-          else
-            self.class.execute(args, options)
-          end
+      run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
+        if options[:capture]
+          self.class.capture(args, options) # already includes kubectl
+        else
+          self.class.execute(args, options)
         end
       end
     end
@@ -44,22 +42,6 @@ module Kubes
       Kubes.config.kubectl.exit_on_fail[@name]
     end
 
-    def switch_context(&block)
-      kubectl = Kubes.config.kubectl
-      context = kubectl.context
-      if context
-        previous_context = capture("kubectl config current-context")
-        sh("kubectl config use-context #{context}", mute: true)
-        result = block.call
-        if !previous_context.blank? && !kubectl.context_keep
-          sh("kubectl config use-context #{previous_context}", mute: true)
-        end
-        result
-      else
-        block.call
-      end
-    end
-
     def args
       # base at end in case of redirection. IE: command > /path
       custom.args + default.args

data/lib/kubes/kubectl/batch.rb

@@ -3,6 +3,7 @@ class Kubes::Kubectl
     include Kubes::Hooks::Concern
     include Kubes::Logging
     include Kubes::Util::Consider
+    include Kubes::Util::Sh
     include Ordering
 
     def initialize(name, options={})
@@ -12,17 +13,43 @@ class Kubes::Kubectl
     def run
       # @options[:preview] is really only used for kubectl delete
       logger.info "Will run:" if @options[:preview]
-      run_hooks("kubes.rb", name: @name) do
-        sorted_files.each do |file|
-          if @options[:preview]
-            logger.info "    kubectl #{@name} -f #{file}"
-          else
-            Kubes::Kubectl.run(@name, @options.merge(file: file))
+      switch_context do
+        run_hooks("kubes.rb", name: @name) do
+          sorted_files.each do |file|
+            if @options[:preview]
+              logger.info "    kubectl #{@name} -f #{file}"
+            else
+              Kubes::Kubectl.run(@name, @options.merge(file: file))
+            end
           end
         end
       end
     end
 
+    def switch_context(&block)
+      kubectl = Kubes.config.kubectl
+      context = kubectl.context
+
+      unless context
+        block.call
+        return
+      end
+
+      previous_context = sh_capture("kubectl config current-context")
+      if previous_context == context
+        block.call
+        return
+      end
+
+      logger.debug "Switching kubectl context to: #{context}"
+      sh("kubectl config use-context #{context}", mute: true)
+      result = block.call
+      if !previous_context.blank? && !kubectl.context_keep
+        sh("kubectl config use-context #{previous_context}", mute: true)
+      end
+      result
+    end
+
     # kubes apply                   # {role: nil, resource: nil}
     # kubes apply clock             # {role: "clock", resource: nil}
     # kubes apply clock deployment  # {role: "clock", resource: "deployment"}

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Tung Nguyen