Skip to content

Commit 1997112

Browse files
sbueringersbueringer
committed
Move Machine deletion timeout fields into deletion group
Signed-off-by: Stefan Büringer [email protected]
1 parent 79d6f0a commit 1997112

File tree

69 files changed

+1749
-1166
lines changed

Some content is hidden

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

69 files changed

+1749
-1166
lines changed

‎.golangci-kal.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ linters:
186186
text: "optionalfields: field AddressRef is optional and should (be a pointer|have the omitempty tag)"
187187
linters:
188188
- kubeapilinter
189+
- path: "api/core/v1beta2/*|api/controlplane/kubeadm/v1beta2/*"
190+
text: "optionalfields: field Deletion is optional and should (be a pointer|have the omitempty tag)"
191+
linters:
192+
- kubeapilinter
189193

190194
issues:
191195
max-same-issues: 0

‎api/controlplane/kubeadm/v1beta1/conversion.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,38 +258,38 @@ func Convert_v1beta1_KubeadmControlPlaneMachineTemplate_To_v1beta2_KubeadmContro
258258
if err := autoConvert_v1beta1_KubeadmControlPlaneMachineTemplate_To_v1beta2_KubeadmControlPlaneMachineTemplate(in, out, s); err != nil {
259259
return err
260260
}
261-
out.NodeDrainTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDrainTimeout)
262-
out.NodeVolumeDetachTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeVolumeDetachTimeout)
263-
out.NodeDeletionTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDeletionTimeout)
261+
out.Deletion.NodeDrainTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDrainTimeout)
262+
out.Deletion.NodeVolumeDetachTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeVolumeDetachTimeout)
263+
out.Deletion.NodeDeletionTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDeletionTimeout)
264264
return nil
265265
}
266266
func Convert_v1beta2_KubeadmControlPlaneMachineTemplate_To_v1beta1_KubeadmControlPlaneMachineTemplate(in *controlplanev1.KubeadmControlPlaneMachineTemplate, out *KubeadmControlPlaneMachineTemplate, s apimachineryconversion.Scope) error {
267267
if err := autoConvert_v1beta2_KubeadmControlPlaneMachineTemplate_To_v1beta1_KubeadmControlPlaneMachineTemplate(in, out, s); err != nil {
268268
return err
269269
}
270-
out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.NodeDrainTimeoutSeconds)
271-
out.NodeVolumeDetachTimeout = clusterv1.ConvertFromSeconds(in.NodeVolumeDetachTimeoutSeconds)
272-
out.NodeDeletionTimeout = clusterv1.ConvertFromSeconds(in.NodeDeletionTimeoutSeconds)
270+
out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDrainTimeoutSeconds)
271+
out.NodeVolumeDetachTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeVolumeDetachTimeoutSeconds)
272+
out.NodeDeletionTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDeletionTimeoutSeconds)
273273
return nil
274274
}
275275

276276
func Convert_v1beta1_KubeadmControlPlaneTemplateMachineTemplate_To_v1beta2_KubeadmControlPlaneTemplateMachineTemplate(in *KubeadmControlPlaneTemplateMachineTemplate, out *controlplanev1.KubeadmControlPlaneTemplateMachineTemplate, s apimachineryconversion.Scope) error {
277277
if err := autoConvert_v1beta1_KubeadmControlPlaneTemplateMachineTemplate_To_v1beta2_KubeadmControlPlaneTemplateMachineTemplate(in, out, s); err != nil {
278278
return err
279279
}
280-
out.NodeDrainTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDrainTimeout)
281-
out.NodeVolumeDetachTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeVolumeDetachTimeout)
282-
out.NodeDeletionTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDeletionTimeout)
280+
out.Deletion.NodeDrainTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDrainTimeout)
281+
out.Deletion.NodeVolumeDetachTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeVolumeDetachTimeout)
282+
out.Deletion.NodeDeletionTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDeletionTimeout)
283283
return nil
284284
}
285285

286286
func Convert_v1beta2_KubeadmControlPlaneTemplateMachineTemplate_To_v1beta1_KubeadmControlPlaneTemplateMachineTemplate(in *controlplanev1.KubeadmControlPlaneTemplateMachineTemplate, out *KubeadmControlPlaneTemplateMachineTemplate, s apimachineryconversion.Scope) error {
287287
if err := autoConvert_v1beta2_KubeadmControlPlaneTemplateMachineTemplate_To_v1beta1_KubeadmControlPlaneTemplateMachineTemplate(in, out, s); err != nil {
288288
return err
289289
}
290-
out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.NodeDrainTimeoutSeconds)
291-
out.NodeVolumeDetachTimeout = clusterv1.ConvertFromSeconds(in.NodeVolumeDetachTimeoutSeconds)
292-
out.NodeDeletionTimeout = clusterv1.ConvertFromSeconds(in.NodeDeletionTimeoutSeconds)
290+
out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDrainTimeoutSeconds)
291+
out.NodeVolumeDetachTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeVolumeDetachTimeoutSeconds)
292+
out.NodeDeletionTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDeletionTimeoutSeconds)
293293
return nil
294294
}
295295

‎api/controlplane/kubeadm/v1beta1/zz_generated.conversion.go

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,14 @@ type KubeadmControlPlaneMachineTemplate struct {
502502
// +kubebuilder:validation:MaxItems=32
503503
ReadinessGates []clusterv1.MachineReadinessGate `json:"readinessGates,omitempty"`
504504

505+
// deletion contains configuration options for Machine deletion.
506+
// +optional
507+
Deletion KubeadmControlPlaneMachineTemplateDeletionSpec `json:"deletion,omitempty,omitzero"`
508+
}
509+
510+
// KubeadmControlPlaneMachineTemplateDeletionSpec contains configuration options for Machine deletion.
511+
// +kubebuilder:validation:MinProperties=1
512+
type KubeadmControlPlaneMachineTemplateDeletionSpec struct {
505513
// nodeDrainTimeoutSeconds is the total amount of time that the controller will spend on draining a controlplane node
506514
// The default value is 0, meaning that the node can be drained without any time limitations.
507515
// NOTE: nodeDrainTimeoutSeconds is different from `kubectl drain --timeout`

‎api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@ type KubeadmControlPlaneTemplateMachineTemplate struct {
136136
// +optional
137137
ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty,omitzero"`
138138

139+
// deletion contains configuration options for Machine deletion.
140+
// +optional
141+
Deletion KubeadmControlPlaneTemplateMachineTemplateDeletionSpec `json:"deletion,omitempty,omitzero"`
142+
}
143+
144+
// KubeadmControlPlaneTemplateMachineTemplateDeletionSpec contains configuration options for Machine deletion.
145+
// +kubebuilder:validation:MinProperties=1
146+
type KubeadmControlPlaneTemplateMachineTemplateDeletionSpec struct {
139147
// nodeDrainTimeoutSeconds is the total amount of time that the controller will spend on draining a controlplane node
140148
// The default value is 0, meaning that the node can be drained without any time limitations.
141149
// NOTE: nodeDrainTimeoutSeconds is different from `kubectl drain --timeout`

‎api/controlplane/kubeadm/v1beta2/zz_generated.deepcopy.go

Lines changed: 38 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)