Skip to content

Commit 2b4c04c

Browse files
committed
Update nodedeletiontimeout for tinkerbell to infinite
1 parent 2b32936 commit 2b4c04c

59 files changed

Lines changed: 61 additions & 1 deletion

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

pkg/providers/tinkerbell/config/template-cp.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ spec:
491491
kind: TinkerbellMachineTemplate
492492
name: {{.controlPlaneTemplateName}}
493493
namespace: {{.eksaSystemNamespace}}
494+
nodeDeletionTimeout: 0s
494495
replicas: {{.controlPlaneReplicas}}
495496
{{- if .upgradeRolloutStrategy }}
496497
rolloutStrategy:
@@ -642,4 +643,4 @@ metadata:
642643
data:
643644
username: {{.registryUsername | b64enc}}
644645
password: {{.registryPassword | b64enc}}
645-
{{- end }}
646+
{{- end }}

pkg/providers/tinkerbell/config/template-md.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ spec:
3030
kind: KubeadmConfigTemplate
3131
name: {{.workloadkubeadmconfigTemplateName}}
3232
clusterName: {{.clusterName}}
33+
nodeDeletionTimeout: 0s
3334
infrastructureRef:
3435
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3536
kind: TinkerbellMachineTemplate

pkg/providers/tinkerbell/reconciler/reconciler_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,7 @@ func tinkerbellCP(clusterName string, opts ...cpOpt) *tinkerbell.ControlPlane {
13211321
},
13221322
Version: "v1.19.8",
13231323
MachineTemplate: controlplanev1.KubeadmControlPlaneMachineTemplate{
1324+
NodeDeletionTimeout: &metav1.Duration{Duration: 0},
13241325
InfrastructureRef: corev1.ObjectReference{
13251326
Kind: "TinkerbellMachineTemplate",
13261327
Name: "workload-cluster-control-plane-1",
@@ -1749,6 +1750,7 @@ func tinkWorker(clusterName string, opts ...workerOpt) *tinkerbell.Workers {
17491750
APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1",
17501751
},
17511752
},
1753+
NodeDeletionTimeout: &metav1.Duration{Duration: 0},
17521754
InfrastructureRef: corev1.ObjectReference{
17531755
Kind: "TinkerbellMachineTemplate",
17541756
Name: clusterName + "-md-0-1",

pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ spec:
308308
kind: TinkerbellMachineTemplate
309309
name: <no value>
310310
namespace: eksa-system
311+
nodeDeletionTimeout: 0s
311312
replicas: 1
312313
rolloutStrategy:
313314
rollingUpdate:

pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ spec:
308308
kind: TinkerbellMachineTemplate
309309
name: <no value>
310310
namespace: eksa-system
311+
nodeDeletionTimeout: 0s
311312
replicas: 1
312313
rolloutStrategy:
313314
rollingUpdate:

pkg/providers/tinkerbell/testdata/expected_kcp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ spec:
317317
kind: TinkerbellMachineTemplate
318318
name: <no value>
319319
namespace: eksa-system
320+
nodeDeletionTimeout: 0s
320321
replicas: 1
321322
rolloutStrategy:
322323
rollingUpdate:

pkg/providers/tinkerbell/testdata/expected_kcp_with_hook_iso_boot.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ spec:
298298
kind: TinkerbellMachineTemplate
299299
name: <no value>
300300
namespace: eksa-system
301+
nodeDeletionTimeout: 0s
301302
replicas: 1
302303
rolloutStrategy:
303304
rollingUpdate:

pkg/providers/tinkerbell/testdata/expected_kcp_with_hook_iso_boot_bootstrap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ spec:
298298
kind: TinkerbellMachineTemplate
299299
name: <no value>
300300
namespace: eksa-system
301+
nodeDeletionTimeout: 0s
301302
replicas: 1
302303
rolloutStrategy:
303304
rollingUpdate:

pkg/providers/tinkerbell/testdata/expected_kct.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ spec:
2323
kind: KubeadmConfigTemplate
2424
name: test-test-1
2525
clusterName: test
26+
nodeDeletionTimeout: 0s
2627
infrastructureRef:
2728
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2829
kind: TinkerbellMachineTemplate

pkg/providers/tinkerbell/testdata/expected_md_with_hook_iso_boot.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ spec:
2323
kind: KubeadmConfigTemplate
2424
name: test-md-0-1
2525
clusterName: test
26+
nodeDeletionTimeout: 0s
2627
infrastructureRef:
2728
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2829
kind: TinkerbellMachineTemplate

0 commit comments

Comments
 (0)