Merge pull request #507 from BaronMsk/my/skip_phases

Add kubeadm skip-phases option

Author: daianamezdrea

lib/puppet/parser/functions/kubeadm_init_flags.rb

@@ -26,6 +26,7 @@ module Puppet::Parser::Functions
     flags << '--skip-token-print' if opts['skip_token_print']
     flags << "--token '#{opts['token']}'" if opts['token'] && opts['token'].to_s != 'undef'
     flags << "--token-ttl '#{opts['token_ttl']}'" if opts['token_ttl'] && opts['token_ttl'].to_s != 'undef'
+    flags << "--skip-phases '#{opts['skip_phases']}'" if opts['skip_phases'] && opts['skip_phases'].to_s != 'undef'
 
     flags.flatten.join(' ')
   end

manifests/cluster_roles.pp

@@ -8,6 +8,7 @@
   Optional[String] $join_discovery_file = $kubernetes::join_discovery_file,
   Optional[Array] $ignore_preflight_errors = $kubernetes::ignore_preflight_errors,
   Optional[Array] $env = $kubernetes::environment,
+  Optional[String] $skip_phases = $kubernetes::skip_phases,
 ) {
   if $container_runtime == 'cri_containerd' {
     $preflight_errors = flatten(['Service-Docker',$ignore_preflight_errors])
@@ -21,6 +22,7 @@
     kubernetes::kubeadm_init { $node_name:
       ignore_preflight_errors => $preflight_errors,
       env                     => $env,
+      skip_phases             => $skip_phases,
     }
   }
 

manifests/init.pp

@@ -504,6 +504,10 @@
 # Directory to use when downloading archives for install.
 # Default to /var/tmp/puppetlabs-kubernetes
 #
+# [*skip_phases*]
+# Allow kubeadm init skip some phases
+# Default: none phases skipped
+#
 # Authors
 # -------
 #
@@ -650,6 +654,7 @@
   Optional[Array] $ignore_preflight_errors                       = undef,
   Stdlib::IP::Address $metrics_bind_address                      = '127.0.0.1',
   Optional[String] $join_discovery_file                          = undef,
+  Optional[String] $skip_phases                                  = undef,
   Integer $conntrack_max_per_core                                = 32768,
   Integer $conntrack_min                                         = 131072,
   String $conntrack_tcp_wait_timeout                             = '1h0m0s',

manifests/kubeadm_init.pp

@@ -6,11 +6,13 @@
   Array $path                                   = $kubernetes::default_path,
   Optional[Array] $env                          = $kubernetes::environment,
   Optional[Array] $ignore_preflight_errors      = $kubernetes::ignore_preflight_errors,
+  Optional[String] $skip_phases                 = $kubernetes::skip_phases,
 ) {
   $kubeadm_init_flags = kubeadm_init_flags( {
       config                  => $config,
       dry_run                 => $dry_run,
       ignore_preflight_errors => $ignore_preflight_errors,
+      skip_phases             => $skip_phases,
   })
 
   $exec_init = "kubeadm init ${kubeadm_init_flags}"