add flags to repo list command

johnpaulsen1 · Dec 12, 2023 · ed87c28 · ed87c28
1 parent cf885fd
commit ed87c28
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/lib/puppet/parser/functions/helm_repo_add_flags.rb b/lib/puppet/parser/functions/helm_repo_add_flags.rb
@@ -9,7 +9,6 @@ module Puppet::Parser::Functions
   newfunction(:helm_repo_add_flags, :type => :rvalue) do |args|
     opts = args[0] || {}
     flags = []
-    flags << 'add' if opts['ensure'].to_s == 'present'
     flags << "'#{opts['repo_name']}'" if opts['repo_name'] && opts['repo_name'].to_s != 'undef'
     flags << "'#{opts['url']}'" if opts['url'] && opts['url'].to_s != 'undef'
     flags << "--ca-file '#{opts['ca_file']}'" if opts['ca_file'] && opts['ca_file'].to_s != 'undef'

diff --git a/lib/puppet/parser/functions/helm_repo_remove_flags.rb b/lib/puppet/parser/functions/helm_repo_remove_flags.rb
@@ -9,7 +9,6 @@ module Puppet::Parser::Functions
   newfunction(:helm_repo_remove_flags, :type => :rvalue) do |args|
     opts = args[0] || {}
     flags = []
-    flags << 'remove' if opts['ensure'].to_s == 'absent'
     flags << "'#{opts['repo_name']}'" if opts['repo_name'] && opts['repo_name'].to_s != 'undef'
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -110,8 +110,8 @@
         url => $url,
       }
     )
-    $exec_repo = "helm repo ${helm_repo_add_flags}"
-    $unless_repo = "helm repo list | awk '{if(NR>1)print \$1}' | grep -w ${repo_name}"
+    $exec_repo = "helm repo add ${helm_repo_add_flags}"
+    $unless_repo = "helm repo list ${helm_repo_add_flags} | awk '{if(NR>1)print \$1}' | grep -w ${repo_name}"
   }
 
   if $ensure == absent {
@@ -127,8 +127,8 @@
         tiller_namespace => $tiller_namespace,
       }
     )
-    $exec_repo = "helm repo ${helm_repo_remove_flags}"
-    $unless_repo = "helm repo list | awk '{if (\$1 == \"${repo_name}\") exit 1}'"
+    $exec_repo = "helm repo remove ${helm_repo_remove_flags}"
+    $unless_repo = "helm repo list ${helm_repo_remove_flags} | awk '{if (\$1 == \"${repo_name}\") exit 1}'"
   }
 
   exec { "helm repo ${repo_name}":

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-helm",
-  "version": "4.1.12",
+  "version": "4.1.13",
   "author": "puppetlabs",
   "summary": "A module to install Helm, a kubernetes package manager",
   "license": "Apache-2.0",