helm-wrapper 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fe7756c771f5de17023c164a926696c6514315542e35b444ef31d4396ac130
-  data.tar.gz: 79334dd60dfc68de644ca511ebefde9b2382ca13bbb7f65e7347868337a13aa8
+  metadata.gz: adfede6ac33bcec8e6948dc9a0501b2ef86c36b985800badb621e64345d697d4
+  data.tar.gz: f2c9b7a4746def6c1e9c614710e3c5ba7cedf4bbc6797cbd75f319c6c4a09d12
 SHA512:
-  metadata.gz: e69d4b002536594076ac8476f791a4e5b0fe3c2062de5cf5f4225e6df1919e21eb19b4ba362ed430d36cc2f01e8bda9edd14ab1f0cc2fa1701955c2d46944b61
-  data.tar.gz: 681c5bc705a01aa22730f6994ac975785701c16d1f39ef0265851cccfdf81404ea97d75b9a8edc868871ff51cdd1dc2a70bd89528411b9bf44698822ef60d76c
+  metadata.gz: 947a1995f242c0a4dd5dca6b931f2d5acf0fc55488dec0a5df1399a9d110e729bd5b46d607eb9cb88a01e5e93c29088bb2cd205834f17cb0f7cb015f4d4c75a7
+  data.tar.gz: 87647c76ea61672ded735f840d7a3d9bf3a42587d74b3c7f34196adc99894c0ea47d04ef94ba3ac8bed4c2e078c24346f6ff77ae6d1f55b1e591520311e72eaf

data/lib/helm-wrapper.rb

@@ -35,7 +35,6 @@ module HelmWrapper
     chart_options["name"]    = chart
     chart_options["path"]    = nil
     chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
-    chart_options["release"] = release
     chart_options["version"] = options.key?("chart-version") ? options["chart-version"] : String.new
 
     config_options = Hash.new
@@ -44,6 +43,7 @@ module HelmWrapper
     config_options["auth-azure-options"] = options.key?("config-auth-azure-options") ? options["config-auth-azure-options"] : Hash.new
     config_options["base"]               = options.key?("config-base")               ? options["config-base"]               : File.join(Dir.pwd, "config")
     config_options["namespace"]          = namespace
+    config_options["release"]            = release
     config_options["timeout"]            = options.key?("config-timeout")            ? options["config-timeout"]            : "5m0s"
     config_options["wait"]               = options.key?("config-wait")               ? options["config-wait"]               : true
 

data/lib/helm-wrapper/shared/chart.rb

@@ -20,7 +20,6 @@ module HelmWrapper
       attr_reader :name
       attr_reader :path
       attr_reader :oci
-      attr_reader :release
       attr_reader :version
 
 ###############################################################################
@@ -39,11 +38,6 @@ module HelmWrapper
 
         @path = options["path"]
 
-        logger.fatal("Chart release instance must be a string!") unless options["release"].kind_of?(String)
-        logger.fatal("Chart release instance must not be blank!") if options["release"].strip.empty?
-
-        @release = options["release"]
-
         logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
 
         @version = options["version"]

data/lib/helm-wrapper/shared/config.rb

@@ -30,6 +30,7 @@ module HelmWrapper
       attr_reader :chart
       attr_reader :name
       attr_reader :namespace
+      attr_reader :release
       attr_reader :path
       attr_reader :timeout
       attr_reader :variables
@@ -52,6 +53,11 @@ module HelmWrapper
 
         @name = options["name"]
 
+        logger.fatal("Configuration release name must be a string!") unless options["release"].kind_of?(String)
+        logger.fatal("Configuration release name must not be blank!") if options["release"].strip.empty?
+
+        @release = options["release"]
+
         logger.fatal("Configuration wait timeout must be a string!") unless options["timeout"].kind_of?(String)
         logger.fatal("Configuration wait timeout must not be blank!") if options["timeout"].strip.empty?
 
@@ -82,7 +88,7 @@ module HelmWrapper
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
         identifers = yaml.key?("identifiers") ? yaml["identifiers"] : Hash.new
-        @variables = HelmWrapper::Shared::Variables.new(chart: @chart.name, config: @name, namespace: namespace, release: @chart.release, identifiers: identifers)
+        @variables = HelmWrapper::Shared::Variables.new(chart: @chart.name, config: @name, namespace: namespace, release: @release, identifiers: identifers)
         @namespace = @variables.core[:namespace]
 
         if yaml.key?("globals") then
@@ -96,7 +102,7 @@ module HelmWrapper
           logger.fatal("Key 'helm' is not a hash in configuration file: #{@path}") unless yaml["helm"].kind_of?(Hash)
           helm = yaml["helm"]
 
-          [ "globals", @chart.release ].each do |extra|
+          [ "globals", @release ].each do |extra|
             if helm.key?(extra) then
               logger.fatal("Key '#{extra}' under 'helm' is not a hash in configuration file: #{@path}") unless helm[extra].kind_of?(Hash)
               section = helm[extra]

data/lib/helm-wrapper/shared/runner.rb

@@ -120,7 +120,7 @@ module HelmWrapper
 
         parameters = Array.new
         parameters.append("--namespace=\"#{@config.namespace}\"")
-        parameters.append("\"#{@chart.release}\"")
+        parameters.append("\"#{@config.release}\"")
 
         logger.fatal("Helm delete failed!") unless run(action: "delete", parameters: parameters)
       end
@@ -133,7 +133,7 @@ module HelmWrapper
 
         parameters = Array.new
         parameters.append("--namespace=\"#{@config.namespace}\"")
-        parameters.append("\"#{@chart.release}\"")
+        parameters.append("\"#{@config.release}\"")
         parameters.append("\"#{@chart.name}\"")
         parameters.append("--version=\"#{@chart.version}\"") unless @chart.version.strip.empty?
         parameters.concat(variable_files)
@@ -152,7 +152,7 @@ module HelmWrapper
         parameters = Array.new
         parameters.append("--namespace=\"#{@config.namespace}\"")
         parameters.append("--install") if install
-        parameters.append("\"#{@chart.release}\"")
+        parameters.append("\"#{@config.release}\"")
         parameters.append("\"#{@chart.name}\"")
         parameters.append("--atomic") if @config.atomic
         parameters.append("--wait") if @config.wait

data/lib/helm-wrapper/tasks/apply.rb

@@ -45,7 +45,7 @@ module HelmWrapper
           config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
 
-          logger.info("Running Helm upgrade for release: #{@chart.release}, namespace: #{config.namespace}...")
+          logger.info("Running Helm upgrade for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_repos

data/lib/helm-wrapper/tasks/destroy.rb

@@ -44,7 +44,7 @@ module HelmWrapper
           config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
 
-          logger.info("Running Helm delete for release: #{@chart.release}, namespace: #{config.namespace}...")
+          logger.info("Running Helm delete for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_auths

data/lib/helm-wrapper/tasks/template.rb

@@ -45,7 +45,7 @@ module HelmWrapper
           config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
 
-          logger.info("Running Helm template for release: #{@chart.release}, namespace: #{config.namespace}...")
+          logger.info("Running Helm template for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_repos

data/lib/helm-wrapper/version.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 
 ###############################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Richard Lees