diff --git a/pkg/providers/tinkerbell/config/template-cp.yaml b/pkg/providers/tinkerbell/config/template-cp.yaml index a99bb6cfa047..32d756317bd2 100644 --- a/pkg/providers/tinkerbell/config/template-cp.yaml +++ b/pkg/providers/tinkerbell/config/template-cp.yaml @@ -560,6 +560,8 @@ spec: matchLabels: {{ range $key, $value := .hardwareSelector}} {{ $key }}: {{ $value}} {{- end }} + bootOptions: + bootMode: netboot templateOverride: | {{.controlPlanetemplateOverride | indent 8}} {{- end }} diff --git a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml index d85a4e0aa229..9230bffeccd1 100644 --- a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml @@ -323,6 +323,8 @@ spec: - labelSelector: matchLabels: type: node + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 0 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml index bfc0e5e6f321..9919a4dd9b66 100644 --- a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml @@ -323,6 +323,8 @@ spec: - labelSelector: matchLabels: type: node + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 0 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_kcp.yaml b/pkg/providers/tinkerbell/testdata/expected_kcp.yaml index bd5a6f07f850..96ce4262e288 100644 --- a/pkg/providers/tinkerbell/testdata/expected_kcp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_kcp.yaml @@ -332,6 +332,8 @@ spec: - labelSelector: matchLabels: type: node + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 0 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml index bc14dd393f95..5a7b3077c090 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml @@ -403,6 +403,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml index 902c74c2575c..47fc7d430f5b 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml @@ -369,6 +369,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml index 14e6199a6ffa..64aa9f23255b 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml @@ -349,6 +349,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml index 0162825f4c2c..9d9953ffe7b0 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml @@ -361,6 +361,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml index e35cac5918a6..bce9272a285a 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml @@ -347,6 +347,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml index c0353fc68a23..a0ae0d37b5ea 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml @@ -383,6 +383,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml index 31c4c316e6c4..9863bdf16572 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml @@ -383,6 +383,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml index 3117c2a9809f..a667e187e141 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml @@ -360,6 +360,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml index 733edcf59afe..e80b0f54d758 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml @@ -316,6 +316,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml index ecc560aef738..0d64a6684361 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml @@ -323,6 +323,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml index 80125553a0f2..58d6cfbbf419 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml @@ -318,6 +318,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml index f45ad44df1ee..2900eab0b1e8 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml @@ -326,6 +326,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml index 19509b3d895e..4113124583b0 100755 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml @@ -318,6 +318,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml index ef7887d5c5dc..94f1ebf0bce3 100755 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml @@ -336,6 +336,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml index a6a01ef4b3a0..aebed5b1818c 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml @@ -326,6 +326,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml index 181a89c2a1b4..15fe31f1dc0c 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml @@ -348,6 +348,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml index 1b44d18ca68f..7266c3b132ad 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml @@ -350,6 +350,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml index b41534ea4ea9..42816e0939d0 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml @@ -324,6 +324,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml index 5beedb551f0f..c374556074a4 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml @@ -323,6 +323,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml index ad69e86b77b2..f39cb7337393 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml @@ -315,6 +315,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml index 733edcf59afe..e80b0f54d758 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml @@ -316,6 +316,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml index 876c51608803..a4f7777f5edb 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml @@ -261,6 +261,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml index 733edcf59afe..e80b0f54d758 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml @@ -316,6 +316,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml index 559e8ac5712b..74ed1e54529b 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml @@ -316,6 +316,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml b/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml index 941541900efb..449ac0fb5bb7 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml @@ -361,6 +361,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: "" diff --git a/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml index 99a906d9a95b..d704c2728199 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml @@ -322,6 +322,8 @@ spec: - labelSelector: matchLabels: type: cp + bootOptions: + bootMode: netboot templateOverride: | global_timeout: 6000 id: ""