Add kubeconfig parameter for all defined types to better support Helm v3

puppetlabs · Jan 14, 2021 · a40c1d1 · a40c1d1
1 parent 9f24618
commit a40c1d1
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 21 deletions.
diff --git a/lib/puppet/parser/functions/helm_chart_update_flags.rb b/lib/puppet/parser/functions/helm_chart_update_flags.rb
@@ -21,6 +21,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--namespace '#{opts['namespace']}'" if opts['namespace'] && opts['namespace'].to_s != 'undef'
     flags << '--no-hooks' if opts['no_hooks']
     flags << '--recreate-pods' if opts['recreate_pods']

diff --git a/lib/puppet/parser/functions/helm_create_flags.rb b/lib/puppet/parser/functions/helm_create_flags.rb
@@ -11,6 +11,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--starter '#{opts['starter']}" if opts['starter'] && opts['starter'].to_s != 'undef'
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'
     flags << "'#{opts['chart_path']}/#{opts['chart_name']}'" if opts['chart_path'] && opts['chart_path'].to_s != 'undef' && opts['chart_name'].to_s != 'undef'

diff --git a/lib/puppet/parser/functions/helm_delete_flags.rb b/lib/puppet/parser/functions/helm_delete_flags.rb
@@ -12,6 +12,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << '--no-hooks' if opts['no_hooks']
     flags << '--purge' if opts['purge']
     flags << "--timeout '#{opts['timeout']}'" if opts['timeout'] && opts['timeout'].to_s != 'undef'

diff --git a/lib/puppet/parser/functions/helm_install_flags.rb b/lib/puppet/parser/functions/helm_install_flags.rb
@@ -18,6 +18,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--name '#{opts['release_name']}'" if opts['release_name'] && opts['release_name'].to_s != 'undef'
     flags << "--name-template '#{opts['name_template']}'" if opts['name_template'] && opts['name_template'].to_s != 'undef'
     flags << "--namespace '#{opts['namespace']}'" if opts['namespace'] && opts['namespace'].to_s != 'undef'

diff --git a/lib/puppet/parser/functions/helm_ls_flags.rb b/lib/puppet/parser/functions/helm_ls_flags.rb
@@ -11,6 +11,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'
     flags << '--short' if opts['short']
     flags << '--tls' if opts['tls']

diff --git a/lib/puppet/parser/functions/helm_package_flags.rb b/lib/puppet/parser/functions/helm_package_flags.rb
@@ -15,6 +15,7 @@ module Puppet::Parser::Functions
     flags << "--key '#{opts['key']}'" if opts['key'] && opts['key'].to_s != 'undef'
     flags << "--keystring '#{opts['keystrings']}'" if opts['keystring'] && opts['keystring'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << '--save' if opts['save']
     flags << '--sign' if opts['sign']
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'

diff --git a/lib/puppet/parser/functions/helm_repo_add_flags.rb b/lib/puppet/parser/functions/helm_repo_add_flags.rb
@@ -16,6 +16,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'
     flags << "--username '#{opts['username']}'" if opts['username'] && opts['username'].to_s != 'undef'
     flags << "--password '#{opts['password']}'" if opts['password'] && opts['password'].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
@@ -11,6 +11,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'
     flags << "'#{opts['repo_name']}'" if opts['repo_name'] && opts['repo_name'].to_s != 'undef'
     flags.flatten.join(' ')

diff --git a/lib/puppet/parser/functions/helm_repo_update_flags.rb b/lib/puppet/parser/functions/helm_repo_update_flags.rb
@@ -11,6 +11,7 @@ module Puppet::Parser::Functions
     flags << "--home '#{opts['home']}'" if opts['home'] && opts['home'].to_s != 'undef'
     flags << "--host '#{opts['host']}'" if opts['host'] && opts['host'].to_s != 'undef'
     flags << "--kube-context '#{opts['kube_context']}'" if opts['kube_context'] && opts['kube_context'].to_s != 'undef'
+    flags << "--kubeconfig '#{opts['kubeconfig']}'" if opts['kubeconfig'] && opts['kubeconfig'].to_s != 'undef'
     flags << "--tiller-namespace '#{opts['tiller_namespace']}'" if opts['tiller_namespace'] && opts['tiller_namespace'].to_s != 'undef'
     flags << 'update' if opts['update']
     flags.flatten.join(' ')

diff --git a/manifests/chart.pp b/manifests/chart.pp
@@ -42,6 +42,9 @@
 # @param kube_context
 #   Name of the kubeconfig context.
 #  
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param name_template
 #   The template used to name the release.
 #  
@@ -121,6 +124,7 @@
   Optional[String] $home              = undef,
   Optional[String] $host              = undef,
   Optional[String] $kube_context      = undef,
+  Optional[String] $kubeconfig        = undef,
   Optional[String] $name_template     = undef,
   Optional[String] $namespace         = undef,
   Boolean $no_hooks                   = false,
@@ -153,9 +157,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   if $ensure == present {
@@ -172,6 +178,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       name_template => $name_template,
       namespace => $namespace,
       no_hooks => $no_hooks,
@@ -198,6 +205,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       tiller_namespace => $_tiller_namespace,
       short => true,
       tls => $tls,
@@ -217,6 +225,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       name_template => $name_template,
       namespace => $namespace,
       no_hooks => $no_hooks,
@@ -237,6 +246,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       tiller_namespace => $_tiller_namespace,
       short => true,
       tls => $tls,

diff --git a/manifests/chart_update.pp b/manifests/chart_update.pp
@@ -47,6 +47,9 @@
 # @param kube_context
 #   Name of the kubeconfig context.
 # 
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param recreate_pods
 #   Performs pods restart for the resource if applicable
 # 
@@ -130,6 +133,7 @@
   Optional[String] $host          = undef,
   Boolean $install                = true,
   Optional[String] $kube_context  = undef,
+  Optional[String] $kubeconfig    = undef,
   Optional[String] $namespace     = undef,
   Boolean $no_hooks               = false,
   Array $path                     = undef,
@@ -163,9 +167,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   if $ensure == present {
@@ -183,6 +189,7 @@
       host => $host,
       install => $install,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       namespace => $namespace,
       no_hooks => $no_hooks,
       recreate_pods => $recreate_pods,
@@ -216,6 +223,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       namespace => $namespace,
       no_hooks => $no_hooks,
       purge => $purge,
@@ -235,6 +243,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       tiller_namespace => $_tiller_namespace,
       short => true,
       tls => $tls,

diff --git a/manifests/create.pp b/manifests/create.pp
@@ -27,6 +27,9 @@
 # @param kube_context
 #   The name of the kubeconfig context.
 # 
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param path
 #   The PATH variable used for exec types.
 # 
@@ -44,6 +47,7 @@
   Optional[String] $home             = undef,
   Optional[String] $host             = undef,
   Optional[String] $kube_context     = undef,
+  Optional[String] $kubeconfig       = undef,
   Optional[Array] $path              = undef,
   Optional[String] $starter          = undef,
   Optional[String] $tiller_namespace = undef,
@@ -55,9 +59,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   $helm_create_flags = helm_create_flags({
@@ -67,6 +73,7 @@
     home => $_home,
     host => $host,
     kube_context => $kube_context,
+    kubeconfig => $_kubeconfig,
     starter => $starter,
     tiller_namespace => $_tiller_namespace,
   })

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -27,6 +27,9 @@
 #   The name for the kubeconfig context.
 #   Defaults to `undef`.
 # 
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param save
 #   Specifies whether to save the packaged chart to the local chart repository.
 #   Valid values are `true`, `false`.
@@ -78,6 +81,7 @@
   Optional[String] $key               = undef,
   Optional[String] $keystring         = undef,
   Optional[String] $kube_context      = undef,
+  Optional[String] $kubeconfig        = undef,
   Optional[Array] $path               = undef,
   Boolean $save                       = true,
   Boolean $sign                       = false,
@@ -91,9 +95,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   $helm_package_flags = helm_package_flags({
@@ -107,6 +113,7 @@
     key => $key,
     keystring => $keystring,
     kube_context => $kube_context,
+    kubeconfig => $_kubeconfig,
     save => $save,
     sign => $sign,
     tiller_namespace => $_tiller_namespace,

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -36,6 +36,9 @@
 # @param kube_context
 #   The name for the kubeconfig context to use.
 #
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param path
 #   The PATH variable used for exec types.
 #
@@ -65,6 +68,7 @@
   Optional[String] $home             = undef,
   Optional[String] $host             = undef,
   Optional[String] $kube_context     = undef,
+  Optional[String] $kubeconfig       = undef,
   Optional[Array] $path              = undef,
   Optional[String] $tiller_namespace = undef,
   Optional[String] $username         = undef,
@@ -79,9 +83,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   if $ensure == present {
@@ -95,6 +101,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       tiller_namespace => $_tiller_namespace,
       username => $username,
       password => $password,
@@ -111,6 +118,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       repo_name => $repo_name,
       tiller_namespace => $_tiller_namespace,
     })

diff --git a/manifests/repo_update.pp b/manifests/repo_update.pp
@@ -19,6 +19,9 @@
 # @param kube_context
 #   The name for the kubeconfig context to use.
 #
+# @param kubeconfig
+#   Path to the kubeconfig (v3 only)
+#
 # @param path
 #   The PATH variable used for exec types.
 #
@@ -35,6 +38,7 @@
   Optional[String] $home             = undef,
   Optional[String] $host             = undef,
   Optional[String] $kube_context     = undef,
+  Optional[String] $kubeconfig       = undef,
   Optional[Array] $path              = undef,
   Optional[String] $tiller_namespace = undef,
   Boolean $update                    = true,
@@ -46,9 +50,11 @@
   if versioncmp($helm::version, '3.0.0') >= 0 {
     $_home = undef
     $_tiller_namespace = undef
+    $_kubeconfig = $kubeconfig
   } else {
     $_home = $home
     $_tiller_namespace = $tiller_namespace
+    $_kubeconfig = undef
   }
 
   if $update {
@@ -57,6 +63,7 @@
       home => $_home,
       host => $host,
       kube_context => $kube_context,
+      kubeconfig => $_kubeconfig,
       tiller_namespace => $_tiller_namespace,
       update => $update,
     })