Skip to content

Commit a1d727e

Browse files
committed
Use namespaced puppet 4.x functions
This change requires puppetlabs/stdlib >= 9 See puppetlabs/puppetlabs-stdlib#1356
1 parent 68e1d8f commit a1d727e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

manifests/config/kubeadm.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@
366366
fail('Cannot use "cloud" as volume name')
367367
}
368368

369-
$apiserver_merged_extra_volumes = merge($apiserver_extra_volumes, $cloud_volume)
370-
$controllermanager_merged_extra_volumes = merge($controllermanager_extra_volumes, $cloud_volume)
369+
$apiserver_merged_extra_volumes = stdlib::merge($apiserver_extra_volumes, $cloud_volume)
370+
$controllermanager_merged_extra_volumes = stdlib::merge($controllermanager_extra_volumes, $cloud_volume)
371371
} else {
372372
$apiserver_merged_extra_volumes = $apiserver_extra_volumes
373373
$controllermanager_merged_extra_volumes = $controllermanager_extra_volumes
@@ -381,9 +381,9 @@
381381
}
382382

383383
# to_yaml emits a complete YAML document, so we must remove the leading '---'
384-
$kubeadm_extra_config_yaml = regsubst(to_yaml($kubeadm_extra_config), '^---\n', '')
385-
$kubelet_extra_config_yaml = regsubst(to_yaml($kubelet_extra_config), '^---\n', '')
386-
$kubelet_extra_config_alpha1_yaml = regsubst(to_yaml($kubelet_extra_config_alpha1), '^---\n', '')
384+
$kubeadm_extra_config_yaml = regsubst(stdlib::to_yaml($kubeadm_extra_config), '^---\n', '')
385+
$kubelet_extra_config_yaml = regsubst(stdlib::to_yaml($kubelet_extra_config), '^---\n', '')
386+
$kubelet_extra_config_alpha1_yaml = regsubst(stdlib::to_yaml($kubelet_extra_config_alpha1), '^---\n', '')
387387

388388
$config_version = $kubernetes_version ? {
389389
/^1\.1(0|1)/ => 'v1alpha1',

manifests/config/worker.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
Optional[Array] $skip_phases_join = $kubernetes::skip_phases_join,
9292
) {
9393
# to_yaml emits a complete YAML document, so we must remove the leading '---'
94-
$kubelet_extra_config_yaml = regsubst(to_yaml($kubelet_extra_config), '^---\n', '')
94+
$kubelet_extra_config_yaml = regsubst(stdlib::to_yaml($kubelet_extra_config), '^---\n', '')
9595

9696
$template = $kubernetes_version ? {
9797
/1\.12/ => 'v1alpha3',

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs-stdlib",
13-
"version_requirement": ">= 4.25.0 < 10.0.0"
13+
"version_requirement": ">= 9.0.0 < 10.0.0"
1414
},
1515
{
1616
"name": "puppetlabs-apt",

0 commit comments

Comments
 (0)