Skip to content

Commit 12a6b84

Browse files
committed
skip_phases
1 parent f75c488 commit 12a6b84

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

lib/puppet/parser/functions/kubeadm_init_flags.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module Puppet::Parser::Functions
2626
flags << '--skip-token-print' if opts['skip_token_print']
2727
flags << "--token '#{opts['token']}'" if opts['token'] && opts['token'].to_s != 'undef'
2828
flags << "--token-ttl '#{opts['token_ttl']}'" if opts['token_ttl'] && opts['token_ttl'].to_s != 'undef'
29+
flags << "--skip-phases '#{opts['skip_phases']}'" if opts['skip_phases'] && opts['skip_phases'].to_s != 'undef'
2930

3031
flags.flatten.join(' ')
3132
end

manifests/cluster_roles.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Optional[String] $join_discovery_file = $kubernetes::join_discovery_file,
99
Optional[Array] $ignore_preflight_errors = $kubernetes::ignore_preflight_errors,
1010
Optional[Array] $env = $kubernetes::environment,
11+
Optional[String] $skip_phases = $kubernetes::skip_phases,
1112
) {
1213
if $container_runtime == 'cri_containerd' {
1314
$preflight_errors = flatten(['Service-Docker',$ignore_preflight_errors])
@@ -21,6 +22,7 @@
2122
kubernetes::kubeadm_init { $node_name:
2223
ignore_preflight_errors => $preflight_errors,
2324
env => $env,
25+
skip_phases => $skip_phases,
2426
}
2527
}
2628

manifests/init.pp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@
499499
# Directory to use when downloading archives for install.
500500
# Default to /var/tmp/puppetlabs-kubernetes
501501
#
502+
# [*skip_phases*]
503+
# Allow kubeadm init skip some phases
504+
# Default: none phases skipped
505+
#
502506
# Authors
503507
# -------
504508
#
@@ -638,6 +642,7 @@
638642
Optional[Array] $ignore_preflight_errors = undef,
639643
Stdlib::IP::Address $metrics_bind_address = '127.0.0.1',
640644
Optional[String] $join_discovery_file = undef,
645+
Optional[String] $skip_phases = undef,
641646
Integer $conntrack_max_per_core = 32768,
642647
Integer $conntrack_min = 131072,
643648
String $conntrack_tcp_wait_timeout = '1h0m0s',

manifests/kubeadm_init.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
Array $path = $kubernetes::default_path,
77
Optional[Array] $env = $kubernetes::environment,
88
Optional[Array] $ignore_preflight_errors = $kubernetes::ignore_preflight_errors,
9+
Optional[String] $skip_phases = $kubernetes::skip_phases,
910
) {
1011
$kubeadm_init_flags = kubeadm_init_flags( {
1112
config => $config,
1213
dry_run => $dry_run,
1314
ignore_preflight_errors => $ignore_preflight_errors,
15+
skip_phases => $skip_phases,
1416
})
1517

1618
$exec_init = "kubeadm init ${kubeadm_init_flags}"

0 commit comments

Comments
 (0)