|
366 | 366 | fail('Cannot use "cloud" as volume name')
|
367 | 367 | }
|
368 | 368 |
|
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) |
371 | 371 | } else {
|
372 | 372 | $apiserver_merged_extra_volumes = $apiserver_extra_volumes
|
373 | 373 | $controllermanager_merged_extra_volumes = $controllermanager_extra_volumes
|
|
381 | 381 | }
|
382 | 382 |
|
383 | 383 | # 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', '') |
387 | 387 |
|
388 | 388 | $config_version = $kubernetes_version ? {
|
389 | 389 | /^1\.1(0|1)/ => 'v1alpha1',
|
|
0 commit comments