Skip to content

Commit d8ff3b9

Browse files
sbueringersbueringer
committed
Change UnhealthyNodeConditions TimeoutSeconds from int32 to *int32
1 parent d1e5173 commit d8ff3b9

20 files changed

+124
-78
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus,
247247
}
248248

249249
if in.LastRemediation.RetryCount == nil {
250-
in.LastRemediation.RetryCount = ptr.To(int32(0)) // RetryCount is a required field and nil does not round trip
250+
in.LastRemediation.RetryCount = ptr.To(int32(0)) // RetryCount is a required field and nil does not round trip
251251
}
252252
}
253253

‎api/core/v1beta1/conversion.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ func Convert_v1beta1_ControlPlaneClass_To_v1beta2_ControlPlaneClass(in *ControlP
681681
out.HealthCheck.Checks.UnhealthyNodeConditions = append(out.HealthCheck.Checks.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
682682
Type: c.Type,
683683
Status: c.Status,
684-
TimeoutSeconds: ptr.Deref(clusterv1.ConvertToSeconds(&c.Timeout), 0),
684+
TimeoutSeconds: clusterv1.ConvertToSeconds(&c.Timeout),
685685
})
686686
}
687687
out.HealthCheck.Checks.NodeStartupTimeoutSeconds = clusterv1.ConvertToSeconds(in.MachineHealthCheck.NodeStartupTimeout)
@@ -721,7 +721,7 @@ func Convert_v1beta2_ControlPlaneClass_To_v1beta1_ControlPlaneClass(in *clusterv
721721
out.MachineHealthCheck.UnhealthyConditions = append(out.MachineHealthCheck.UnhealthyConditions, UnhealthyCondition{
722722
Type: c.Type,
723723
Status: c.Status,
724-
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(&c.TimeoutSeconds), metav1.Duration{}),
724+
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(c.TimeoutSeconds), metav1.Duration{}),
725725
})
726726
}
727727
out.MachineHealthCheck.NodeStartupTimeout = clusterv1.ConvertFromSeconds(in.HealthCheck.Checks.NodeStartupTimeoutSeconds)
@@ -769,7 +769,7 @@ func Convert_v1beta1_ControlPlaneTopology_To_v1beta2_ControlPlaneTopology(in *Co
769769
out.HealthCheck.Checks.UnhealthyNodeConditions = append(out.HealthCheck.Checks.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
770770
Type: c.Type,
771771
Status: c.Status,
772-
TimeoutSeconds: ptr.Deref(clusterv1.ConvertToSeconds(&c.Timeout), 0),
772+
TimeoutSeconds: clusterv1.ConvertToSeconds(&c.Timeout),
773773
})
774774
}
775775
out.HealthCheck.Checks.NodeStartupTimeoutSeconds = clusterv1.ConvertToSeconds(in.MachineHealthCheck.NodeStartupTimeout)
@@ -805,7 +805,7 @@ func Convert_v1beta2_ControlPlaneTopology_To_v1beta1_ControlPlaneTopology(in *cl
805805
out.MachineHealthCheck.UnhealthyConditions = append(out.MachineHealthCheck.UnhealthyConditions, UnhealthyCondition{
806806
Type: c.Type,
807807
Status: c.Status,
808-
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(&c.TimeoutSeconds), metav1.Duration{}),
808+
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(c.TimeoutSeconds), metav1.Duration{}),
809809
})
810810
}
811811
out.MachineHealthCheck.NodeStartupTimeout = clusterv1.ConvertFromSeconds(in.HealthCheck.Checks.NodeStartupTimeoutSeconds)
@@ -858,7 +858,7 @@ func Convert_v1beta1_MachineDeploymentClass_To_v1beta2_MachineDeploymentClass(in
858858
out.HealthCheck.Checks.UnhealthyNodeConditions = append(out.HealthCheck.Checks.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
859859
Type: c.Type,
860860
Status: c.Status,
861-
TimeoutSeconds: ptr.Deref(clusterv1.ConvertToSeconds(&c.Timeout), 0),
861+
TimeoutSeconds: clusterv1.ConvertToSeconds(&c.Timeout),
862862
})
863863
}
864864
out.HealthCheck.Checks.NodeStartupTimeoutSeconds = clusterv1.ConvertToSeconds(in.MachineHealthCheck.NodeStartupTimeout)
@@ -931,7 +931,7 @@ func Convert_v1beta2_MachineDeploymentClass_To_v1beta1_MachineDeploymentClass(in
931931
out.MachineHealthCheck.UnhealthyConditions = append(out.MachineHealthCheck.UnhealthyConditions, UnhealthyCondition{
932932
Type: c.Type,
933933
Status: c.Status,
934-
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(&c.TimeoutSeconds), metav1.Duration{}),
934+
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(c.TimeoutSeconds), metav1.Duration{}),
935935
})
936936
}
937937
out.MachineHealthCheck.NodeStartupTimeout = clusterv1.ConvertFromSeconds(in.HealthCheck.Checks.NodeStartupTimeoutSeconds)
@@ -986,7 +986,7 @@ func Convert_v1beta1_MachineDeploymentTopology_To_v1beta2_MachineDeploymentTopol
986986
out.HealthCheck.Checks.UnhealthyNodeConditions = append(out.HealthCheck.Checks.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
987987
Type: c.Type,
988988
Status: c.Status,
989-
TimeoutSeconds: ptr.Deref(clusterv1.ConvertToSeconds(&c.Timeout), 0),
989+
TimeoutSeconds: clusterv1.ConvertToSeconds(&c.Timeout),
990990
})
991991
}
992992
out.HealthCheck.Checks.NodeStartupTimeoutSeconds = clusterv1.ConvertToSeconds(in.MachineHealthCheck.NodeStartupTimeout)
@@ -1052,7 +1052,7 @@ func Convert_v1beta2_MachineDeploymentTopology_To_v1beta1_MachineDeploymentTopol
10521052
out.MachineHealthCheck.UnhealthyConditions = append(out.MachineHealthCheck.UnhealthyConditions, UnhealthyCondition{
10531053
Type: c.Type,
10541054
Status: c.Status,
1055-
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(&c.TimeoutSeconds), metav1.Duration{}),
1055+
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(c.TimeoutSeconds), metav1.Duration{}),
10561056
})
10571057
}
10581058
out.MachineHealthCheck.NodeStartupTimeout = clusterv1.ConvertFromSeconds(in.HealthCheck.Checks.NodeStartupTimeoutSeconds)
@@ -1457,7 +1457,7 @@ func Convert_v1beta1_MachineHealthCheckSpec_To_v1beta2_MachineHealthCheckSpec(in
14571457
out.Checks.UnhealthyNodeConditions = append(out.Checks.UnhealthyNodeConditions, clusterv1.UnhealthyNodeCondition{
14581458
Type: c.Type,
14591459
Status: c.Status,
1460-
TimeoutSeconds: ptr.Deref(clusterv1.ConvertToSeconds(&c.Timeout), 0),
1460+
TimeoutSeconds: clusterv1.ConvertToSeconds(&c.Timeout),
14611461
})
14621462
}
14631463
out.Checks.NodeStartupTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeStartupTimeout)
@@ -1481,7 +1481,7 @@ func Convert_v1beta2_MachineHealthCheckSpec_To_v1beta1_MachineHealthCheckSpec(in
14811481
out.UnhealthyConditions = append(out.UnhealthyConditions, UnhealthyCondition{
14821482
Type: c.Type,
14831483
Status: c.Status,
1484-
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(&c.TimeoutSeconds), metav1.Duration{}),
1484+
Timeout: ptr.Deref(clusterv1.ConvertFromSeconds(c.TimeoutSeconds), metav1.Duration{}),
14851485
})
14861486
}
14871487
out.NodeStartupTimeout = clusterv1.ConvertFromSeconds(in.Checks.NodeStartupTimeoutSeconds)

‎api/core/v1beta1/conversion_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ func ClusterFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
9898
hubClusterStatus,
9999
hubClusterVariable,
100100
hubFailureDomain,
101+
hubUnhealthyNodeCondition,
101102
spokeCluster,
102103
spokeClusterTopology,
103104
spokeObjectReference,
@@ -168,6 +169,14 @@ func hubFailureDomain(in *clusterv1.FailureDomain, c randfill.Continue) {
168169
in.ControlPlane = ptr.To(c.Bool())
169170
}
170171

172+
func hubUnhealthyNodeCondition(in *clusterv1.UnhealthyNodeCondition, c randfill.Continue) {
173+
c.FillNoCustom(in)
174+
175+
if in.TimeoutSeconds == nil {
176+
in.TimeoutSeconds = ptr.To(int32(0)) // TimeoutSeconds is a required field and nil does not round trip
177+
}
178+
}
179+
171180
func spokeCluster(in *Cluster, c randfill.Continue) {
172181
c.FillNoCustom(in)
173182

@@ -259,6 +268,7 @@ func ClusterClassFuncs(_ runtimeserializer.CodecFactory) []interface{} {
259268
hubClusterClassStatus,
260269
hubJSONPatch,
261270
hubJSONSchemaProps,
271+
hubUnhealthyNodeCondition,
262272
spokeClusterClass,
263273
spokeObjectReference,
264274
spokeClusterClassStatus,
@@ -713,6 +723,7 @@ func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c randfill.Contin
713723

714724
func MachineHealthCheckFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
715725
return []interface{}{
726+
hubUnhealthyNodeCondition,
716727
hubMachineHealthCheckStatus,
717728
spokeMachineHealthCheck,
718729
spokeMachineHealthCheckSpec,

‎api/core/v1beta2/machinehealthcheck_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ type UnhealthyNodeCondition struct {
231231
// for at least 1 hour before being considered unhealthy.
232232
// +required
233233
// +kubebuilder:validation:Minimum=0
234-
TimeoutSeconds int32 `json:"timeoutSeconds"`
234+
TimeoutSeconds *int32 `json:"timeoutSeconds,omitempty"`
235235
}
236236

237237
// MachineHealthCheckStatus defines the observed state of MachineHealthCheck.

‎api/core/v1beta2/zz_generated.deepcopy.go

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

‎api/core/v1beta2/zz_generated.openapi.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exp/topology/desiredstate/desired_state_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,12 +1738,12 @@ func TestComputeMachineDeployment(t *testing.T) {
17381738
{
17391739
Type: corev1.NodeReady,
17401740
Status: corev1.ConditionUnknown,
1741-
TimeoutSeconds: 5 * 60,
1741+
TimeoutSeconds: ptr.To(int32(5 * 60)),
17421742
},
17431743
{
17441744
Type: corev1.NodeReady,
17451745
Status: corev1.ConditionFalse,
1746-
TimeoutSeconds: 5 * 60,
1746+
TimeoutSeconds: ptr.To(int32(5 * 60)),
17471747
},
17481748
}
17491749
nodeTimeoutDuration := ptr.To(int32(1))
@@ -3411,12 +3411,12 @@ func Test_computeMachineHealthCheck(t *testing.T) {
34113411
{
34123412
Type: corev1.NodeReady,
34133413
Status: corev1.ConditionUnknown,
3414-
TimeoutSeconds: 5 * 60,
3414+
TimeoutSeconds: ptr.To(int32(5 * 60)),
34153415
},
34163416
{
34173417
Type: corev1.NodeReady,
34183418
Status: corev1.ConditionFalse,
3419-
TimeoutSeconds: 5 * 60,
3419+
TimeoutSeconds: ptr.To(int32(5 * 60)),
34203420
},
34213421
},
34223422
NodeStartupTimeoutSeconds: ptr.To(int32(1)),
@@ -3453,12 +3453,12 @@ func Test_computeMachineHealthCheck(t *testing.T) {
34533453
{
34543454
Type: corev1.NodeReady,
34553455
Status: corev1.ConditionUnknown,
3456-
TimeoutSeconds: 5 * 60,
3456+
TimeoutSeconds: ptr.To(int32(5 * 60)),
34573457
},
34583458
{
34593459
Type: corev1.NodeReady,
34603460
Status: corev1.ConditionFalse,
3461-
TimeoutSeconds: 5 * 60,
3461+
TimeoutSeconds: ptr.To(int32(5 * 60)),
34623462
},
34633463
},
34643464
NodeStartupTimeoutSeconds: ptr.To(int32(1)),

0 commit comments

Comments
 (0)