Skip to content

Commit d0f24f9

Browse files
author
carabasdaniel
authored
Merge pull request #519 from ZloeSabo/feature/allow-configuring-sa-waiting
Allow configuring of waiting times during sa creation
2 parents cbfc76e + d0f35c8 commit d0f24f9

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

REFERENCE.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,8 @@ The following parameters are available in the `kubernetes` class:
12231223
* [`conntrack_tcp_wait_timeout`](#conntrack_tcp_wait_timeout)
12241224
* [`conntrack_tcp_stablished_timeout`](#conntrack_tcp_stablished_timeout)
12251225
* [`tmp_directory`](#tmp_directory)
1226+
* [`wait_for_default_sa_tries`](#wait_for_default_sa_tries)
1227+
* [`wait_for_default_sa_try_sleep`](#wait_for_default_sa_try_sleep)
12261228

12271229
##### <a name="kubernetes_version"></a>`kubernetes_version`
12281230

@@ -2214,6 +2216,22 @@ Data type: `String`
22142216

22152217
Default value: `'/var/tmp/puppetlabs-kubernetes'`
22162218

2219+
##### <a name="wait_for_default_sa_tries"></a>`wait_for_default_sa_tries`
2220+
2221+
Data type: `Integer`
2222+
2223+
2224+
2225+
Default value: `5`
2226+
2227+
##### <a name="wait_for_default_sa_try_sleep"></a>`wait_for_default_sa_try_sleep`
2228+
2229+
Data type: `Integer`
2230+
2231+
2232+
2233+
Default value: `6`
2234+
22172235
### <a name="kubernetescluster_roles"></a>`kubernetes::cluster_roles`
22182236

22192237
The kubernetes::cluster_roles class.
@@ -4070,15 +4088,15 @@ Data type: `Optional[Integer]`
40704088

40714089

40724090

4073-
Default value: `5`
4091+
Default value: `$kubernetes::wait_for_default_sa_tries`
40744092

40754093
##### <a name="try_sleep"></a>`try_sleep`
40764094

40774095
Data type: `Optional[Integer]`
40784096

40794097

40804098

4081-
Default value: `6`
4099+
Default value: `$kubernetes::wait_for_default_sa_try_sleep`
40824100

40834101
##### <a name="env"></a>`env`
40844102

manifests/init.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,8 @@
677677
String $conntrack_tcp_wait_timeout = '1h0m0s',
678678
String $conntrack_tcp_stablished_timeout = '24h0m0s',
679679
String $tmp_directory = '/var/tmp/puppetlabs-kubernetes',
680+
Integer $wait_for_default_sa_tries = 5,
681+
Integer $wait_for_default_sa_try_sleep = 6,
680682
) {
681683
if !$facts['os']['family'] in ['Debian', 'RedHat'] {
682684
notify { "The OS family ${facts['os']['family']} is not supported by this module": }

manifests/wait_for_default_sa.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
String $namespace = $title,
44
Array $path = $kubernetes::default_path,
55
Optional[Integer] $timeout = undef,
6-
Optional[Integer] $tries = 5,
7-
Optional[Integer] $try_sleep = 6,
6+
Optional[Integer] $tries = $kubernetes::wait_for_default_sa_tries,
7+
Optional[Integer] $try_sleep = $kubernetes::wait_for_default_sa_try_sleep,
88
Optional[Array] $env = $kubernetes::environment,
99
) {
1010
$safe_namespace = shell_escape($namespace)

0 commit comments

Comments
 (0)