helm-wrapper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923aefc31c6e395f1dc27df249666f1d39b2a02c631b5a1b5393d1605a464e7f
-  data.tar.gz: 83b14577df977b0273399198e95fd5d978c64ed9ab4a9b3321026babf4f497cf
+  metadata.gz: 23a98e1d049b80c3d5a7c4f78349d3c7cfee900b3ccc2d2d07253a8f5db77b41
+  data.tar.gz: c4ad848608a1ac99eebfe8ed0e22cd51baa1c1a5369fd3ee5a30c4435b3f0b43
 SHA512:
-  metadata.gz: 4f9f3b4fb138c405cad4a2f9c05111354d8f15f098f19da0d266d3e5c26592d857d81a8486580b6537045a02346a78ea305ea5a4bb83687341a35ed178270c9d
-  data.tar.gz: 6d43ad0934729dcdbd429e7746f37ebeefdc20b6c478d183e10223d658b6c0b9699fb977808c7fd176e71c052201d8b6ac202ee9e20fcec1be30e15e11d3401a
+  metadata.gz: 8d4867c74ca557cab7e1f61d2ba8f26b6db6414f04cd21d20b447e192d31fab91553dd339aca23ba923c839ef6d47babe7c7f675188080260a536ab1a071313b
+  data.tar.gz: 062e697684c166bff0c388031947575bbc8c39a39b0571ea072b2e74724abb2549f987fd911be6ebf0e733a053220a0e2f44f0ecf3b2bad13a41570cef46bf6d

data/lib/helm-wrapper.rb

@@ -32,8 +32,9 @@ module HelmWrapper
     binary_options["version"] = options.key?("binary-version") ? options["binary-version"] : Shared::Latest.instance.version
 
     chart_options = Hash.new
-    chart_options["name"]  = chart
-    chart_options["repos"] = options.key?("chart-repos") ? options["chart-repos"] : Array.new
+    chart_options["name"]    = chart
+    chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
+    chart_options["version"] = options.key?("chart-version") ? options["chart-version"] : String.new
 
     config_options = Hash.new
     config_options["auth-azure"]         = options.key?("config-auth-azure")         ? options["config-auth-azure"]         : false

data/lib/helm-wrapper/shared/auths/azure.rb

@@ -116,11 +116,11 @@ module HelmWrapper
           logger.fatal("Azure authenticator keyvault must not be blank!") if @options["keyvault"].strip.empty?
 
           keyvault = @options["keyvault"]
-          if @options.key?("ca-certificate") then
-            logger.fatal("Azure authenticator keyvault certificate for Kubernetes CA must be a string!") unless @options["ca-certificate"].kind_of?(String)
-            logger.fatal("Azure authenticator keyvault certificate for Kubernetes CA must not be blank!") if @options["ca-certificate"].strip.empty?
+          if @options.key?("ca-secret") then
+            logger.fatal("Azure authenticator keyvault secret for Kubernetes CA must be a string!") unless @options["ca-secret"].kind_of?(String)
+            logger.fatal("Azure authenticator keyvault secret for Kubernetes CA must not be blank!") if @options["ca-secret"].strip.empty?
 
-            ca = @options["ca-certificate"]
+            ca = @options["ca-secret"]
           else
             ca = "kubernetes-ca"
           end

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

@@ -16,9 +16,10 @@ module HelmWrapper
 
 ###############################################################################
 
-      attr_reader :oci
-      attr_reader :name
       attr_reader :artefact
+      attr_reader :name
+      attr_reader :oci
+      attr_reader :version
 
 ###############################################################################
 
@@ -28,6 +29,10 @@ module HelmWrapper
 
         @name = options["name"]
 
+        logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+
+        @version = options["version"]
+
         logger.fatal("Chart repos must be a list of hashes!") unless options["repos"].kind_of?(Array)
 
         repos = options["repos"]

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

@@ -82,15 +82,8 @@ module HelmWrapper
           @variables.add_files(base: @base, files: helm["files"]) if helm.key?("files")
         end
 
-        begin
-          namespace = namespace % @variables.values
-          release   = release   % @variables.values
-        rescue
-          logger.fatal("Provided configuration options contain variables that are not included in the configuration file!")
-        end
-
-        @namespace = namespace
-        @release   = release
+        @namespace = @variables.core[:namespace]
+        @release   = @variables.core[:release]
 
         @auths = Array.new
         @auths.append(HelmWrapper::Shared::Auths::Azure.new(options: auth_azure_options, variables: @variables)) if auth_azure

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

@@ -108,7 +108,7 @@ module HelmWrapper
         logger.fatal("Cannot Helm delete before initialising authenticators!") unless auths
 
         parameters = Array.new
-        parameters.append("--namespace \"#{@config.namespace}\"")
+        parameters.append("--namespace=\"#{@config.namespace}\"")
         parameters.append(@config.release)
 
         logger.fatal("Helm delete failed!") unless run(action: "delete", parameters: parameters)
@@ -121,10 +121,11 @@ module HelmWrapper
         logger.fatal("Cannot Helm upgrade before initialising repositories!") unless repos
 
         parameters = Array.new
-        parameters.append("--namespace \"#{@config.namespace}\"")
+        parameters.append("--namespace=\"#{@config.namespace}\"")
         parameters.append("--install") if install
         parameters.append(@config.release)
         parameters.append(@chart.name)
+        parameters.append("--version=\"#{@chart.version}\"") unless @chart.version.strip.empty?
         parameters.concat(variable_files)
         parameters.concat(variable_strings)
 

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 chart: #{@chart.name}...")
+          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 chart: #{@chart.name}...")
+          logger.info("Running Helm delete for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_auths

data/lib/helm-wrapper/version.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
 ###############################################################################
 

metadata

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