kubernetes-deploy 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9843cd4324ce81800fa02b9e84093523560c3b84d22f43da17d5f80f592b3c9
-  data.tar.gz: cdd79de172e2568e2a2cf2dc86fbc0248c173481903a6c936a762393eb9797bf
+  metadata.gz: dbfc9ddacc1877541f3c3d580be4e4f8dd2e4bbb59f6bbe52232ccc77985df1e
+  data.tar.gz: 1b15550b1ba3eada31790eb1b5521be3f6a9837108e379f97eb9791548b1478a
 SHA512:
-  metadata.gz: d7ffcb45240a99cb05259138b65134c1e50d6a0449368b4da1bb7765a65b5a45270fba91a5db7dd2d509af493b85b0fb04314dae23b595b561ebd00e56e402f6
-  data.tar.gz: bdcad6cd5291598baf26f954ead30c6b1ce2210cc210d8415290b626ed6533ccd06865a8ad00008eda02f003d855791f3a0aafcadb3cb065720983c442d07ec4
+  metadata.gz: 3f7fe96e6737b17e2d979ca6cbf6c21b8f2524a4029d0a1756c859029a003688ad0b51e6d9f55ac34190ca635a9b071a657b3654d3c7f2793627505e0cd5942c
+  data.tar.gz: 438181bf2d2e491c0ffb5565a96f98b4d2d9352b6a88958fae80cfaedc1590a11cd0a768f1e35878a59f13ec5e57b18f3d8ce89459ba16be014d41c706d5e5b4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## next
 
+## 0.26.3
+
+*Bug fixes*
+- Fixes a bug introduced in 0.26.0 where listing multiple files in the $KUBECONFIG environment variable would throw an error ([#468](https://github.com/Shopify/kubernetes-deploy/pull/468))
+- Fixes a bug introduced in 0.26.2 where kubernetes-render started adding YAML headers to empty render results ([#467](https://github.com/Shopify/kubernetes-deploy/pull/467))
+
 ## 0.26.2
 
 *Enhancements*
@@ -7,7 +13,7 @@
 through a yaml parser. ([#454](https://github.com/Shopify/kubernetes-deploy/pull/454))
 
 *Bug fixes*
-- Remove use of deprecated feature preventing use with Kuberentes 1.14 ([#460](https://github.com/Shopify/kubernetes-deploy/pull/460))
+- Remove use of deprecated feature preventing use with Kubernetes 1.14 ([#460](https://github.com/Shopify/kubernetes-deploy/pull/460))
 
 ## 0.26.1
 

data/lib/kubernetes-deploy/kubeclient_builder.rb

@@ -7,18 +7,14 @@ module KubernetesDeploy
     class ContextMissingError < FatalDeploymentError
       def initialize(context_name, kubeconfig)
         super("`#{context_name}` context must be configured in your " \
-          "KUBECONFIG file(s) (#{kubeconfig}).")
+          "KUBECONFIG file(s) (#{kubeconfig.join(', ')}).")
       end
     end
 
-    def self.kubeconfig
-      new.kubeconfig
-    end
-
-    attr_reader :kubeconfig
-
     def initialize(kubeconfig: ENV["KUBECONFIG"])
-      @kubeconfig = kubeconfig || "#{Dir.home}/.kube/config"
+      files = kubeconfig || "#{Dir.home}/.kube/config"
+      # Split the list by colon for Linux and Mac, and semicolon for Windows.
+      @kubeconfig_files = files.split(/[:;]/).map!(&:strip).reject(&:empty?)
     end
 
     def build_v1_kubeclient(context)
@@ -100,33 +96,32 @@ module KubernetesDeploy
       )
     end
 
-    def config_files
-      # Split the list by colon for Linux and Mac, and semicolon for Windows.
-      kubeconfig.split(/[:;]/).map!(&:strip).reject(&:empty?)
-    end
-
     def validate_config_files
       errors = []
-      if config_files.empty?
+      if @kubeconfig_files.empty?
         errors << "Kube config file name(s) not set in $KUBECONFIG"
       else
-        config_files.each do |f|
-          unless File.file?(f)
-            errors << "Kube config not found at #{f}"
-          end
+        @kubeconfig_files.each do |f|
+          # If any files in the list are not valid, we can't be sure the merged context list is what the user intended
+          errors << "Kube config not found at #{f}" unless File.file?(f)
         end
       end
       errors
     end
 
+    def validate_config_files!
+      errors = validate_config_files
+      raise TaskConfigurationError, errors.join(', ') if errors.present?
+    end
+
     private
 
     def build_kubeclient(api_version:, context:, endpoint_path: nil)
+      validate_config_files!
+      @kubeclient_configs ||= @kubeconfig_files.map { |f| KubeConfig.read(f) }
       # Find a context defined in kube conf files that matches the input context by name
-      configs = config_files.map { |f| KubeConfig.read(f) }
-      config = configs.find { |c| c.contexts.include?(context) }
-
-      raise ContextMissingError.new(context, kubeconfig) unless config
+      config = @kubeclient_configs.find { |c| c.contexts.include?(context) }
+      raise ContextMissingError.new(context, @kubeconfig_files) unless config
 
       kube_context = config.context(context)
       client = Kubeclient::Client.new(

data/lib/kubernetes-deploy/kubectl.rb

@@ -9,7 +9,6 @@ module KubernetesDeploy
 
     def initialize(namespace:, context:, logger:, log_failure_by_default:, default_timeout: DEFAULT_TIMEOUT,
       output_is_sensitive_default: false)
-      @kubeconfig = KubeclientBuilder.kubeconfig
       @namespace = namespace
       @context = context
       @logger = logger
@@ -27,7 +26,6 @@ module KubernetesDeploy
       output_is_sensitive = @output_is_sensitive_default if output_is_sensitive.nil?
 
       args = args.unshift("kubectl")
-      args.push("--kubeconfig=#{@kubeconfig}")
       args.push("--namespace=#{@namespace}") if use_namespace
       args.push("--context=#{@context}")     if use_context
       args.push("--output=#{output}") if output

data/lib/kubernetes-deploy/render_task.rb

@@ -65,14 +65,19 @@ module KubernetesDeploy
     end
 
     def render_filename(filename, stream)
-      @logger.info("Rendering #{File.basename(filename)} ...")
+      file_basename = File.basename(filename)
+      @logger.info("Rendering #{file_basename}...")
       file_content = File.read(File.join(@template_dir, filename))
       rendered_content = @renderer.render_template(filename, file_content)
       implicit = true
       YAML.parse_stream(rendered_content, "<rendered> #{filename}") { |d| implicit = d.implicit }
-      stream.puts "---\n" if implicit
-      stream.puts rendered_content
-      @logger.info("Rendered #{File.basename(filename)}")
+      if rendered_content.present?
+        stream.puts "---\n" if implicit
+        stream.puts rendered_content
+        @logger.info("Rendered #{file_basename}")
+      else
+        @logger.warn("Rendered #{file_basename} successfully, but the result was blank")
+      end
     rescue Psych::SyntaxError => exception
       raise InvalidTemplateError.new("Template is not valid YAML. #{exception.message}", filename: filename)
     end

data/lib/kubernetes-deploy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module KubernetesDeploy
-  VERSION = "0.26.2"
+  VERSION = "0.26.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport