Merge pull request #11369 from sbueringer/pr-fix-panics

k8s-ci-robot · web-flow · commit 90e86ab29421 · 2024-11-04T12:37:28.000Z
🐛 Fix panics in SetV1Beta2Conditions methods
diff --git a/api/v1beta1/cluster_types.go b/api/v1beta1/cluster_types.go
@@ -651,7 +651,7 @@ func (c *Cluster) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *Cluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &ClusterV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/api/v1beta1/clusterclass_types.go b/api/v1beta1/clusterclass_types.go
@@ -1021,7 +1021,7 @@ func (c *ClusterClass) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *ClusterClass) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &ClusterClassV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/api/v1beta1/machine_types.go b/api/v1beta1/machine_types.go
@@ -645,7 +645,7 @@ func (m *Machine) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *Machine) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &MachineV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/api/v1beta1/machinedeployment_types.go b/api/v1beta1/machinedeployment_types.go
@@ -550,7 +550,7 @@ func (m *MachineDeployment) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *MachineDeployment) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &MachineDeploymentV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/api/v1beta1/machinehealthcheck_types.go b/api/v1beta1/machinehealthcheck_types.go
@@ -224,7 +224,7 @@ func (m *MachineHealthCheck) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *MachineHealthCheck) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &MachineHealthCheckV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/api/v1beta1/machineset_types.go b/api/v1beta1/machineset_types.go
@@ -365,7 +365,7 @@ func (m *MachineSet) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *MachineSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &MachineSetV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go
@@ -501,7 +501,7 @@ func (c *KubeadmConfig) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *KubeadmConfig) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &KubeadmConfigV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_types.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_types.go
@@ -428,7 +428,7 @@ func (in *KubeadmControlPlane) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (in *KubeadmControlPlane) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if in.Status.V1Beta2 == nil && conditions != nil {
+	if in.Status.V1Beta2 == nil {
 		in.Status.V1Beta2 = &KubeadmControlPlaneV1Beta2Status{}
 	}
 	in.Status.V1Beta2.Conditions = conditions
diff --git a/exp/addons/api/v1beta1/clusterresourceset_types.go b/exp/addons/api/v1beta1/clusterresourceset_types.go
@@ -141,7 +141,7 @@ func (m *ClusterResourceSet) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *ClusterResourceSet) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &ClusterResourceSetV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/exp/api/v1beta1/machinepool_types.go b/exp/api/v1beta1/machinepool_types.go
@@ -283,7 +283,7 @@ func (m *MachinePool) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (m *MachinePool) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if m.Status.V1Beta2 == nil && conditions != nil {
+	if m.Status.V1Beta2 == nil {
 		m.Status.V1Beta2 = &MachinePoolV1Beta2Status{}
 	}
 	m.Status.V1Beta2.Conditions = conditions
diff --git a/test/infrastructure/docker/api/v1beta1/dockercluster_types.go b/test/infrastructure/docker/api/v1beta1/dockercluster_types.go
@@ -159,7 +159,7 @@ func (c *DockerCluster) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *DockerCluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &DockerClusterV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/test/infrastructure/docker/api/v1beta1/dockermachine_types.go b/test/infrastructure/docker/api/v1beta1/dockermachine_types.go
@@ -154,7 +154,7 @@ func (c *DockerMachine) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *DockerMachine) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &DockerMachineV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemorycluster_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemorycluster_types.go
@@ -111,7 +111,7 @@ func (c *InMemoryCluster) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *InMemoryCluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &InMemoryClusterV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/test/infrastructure/inmemory/api/v1alpha1/inmemorymachine_types.go b/test/infrastructure/inmemory/api/v1alpha1/inmemorymachine_types.go
@@ -202,7 +202,7 @@ func (c *InMemoryMachine) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (c *InMemoryMachine) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if c.Status.V1Beta2 == nil && conditions != nil {
+	if c.Status.V1Beta2 == nil {
 		c.Status.V1Beta2 = &InMemoryMachineV1Beta2Status{}
 	}
 	c.Status.V1Beta2.Conditions = conditions
diff --git a/util/test/builder/v1beta2_transition.go b/util/test/builder/v1beta2_transition.go
@@ -162,7 +162,7 @@ func (o *Phase1Obj) GetV1Beta2Conditions() []metav1.Condition {
 
 // SetV1Beta2Conditions sets conditions for an API object.
 func (o *Phase1Obj) SetV1Beta2Conditions(conditions []metav1.Condition) {
-	if o.Status.V1Beta2 == nil && conditions != nil {
+	if o.Status.V1Beta2 == nil {
 		o.Status.V1Beta2 = &Phase1ObjStatusV1Beta2{}
 	}
 	o.Status.V1Beta2.Conditions = conditions
@@ -233,10 +233,10 @@ func (o *Phase2Obj) GetConditions() clusterv1.Conditions {
 
 // SetConditions sets the conditions on this object.
 func (o *Phase2Obj) SetConditions(conditions clusterv1.Conditions) {
-	if o.Status.Deprecated == nil && conditions != nil {
+	if o.Status.Deprecated == nil {
 		o.Status.Deprecated = &Phase2ObjStatusDeprecated{V1Beta1: &Phase2ObjStatusDeprecatedV1Beta1{}}
 	}
-	if o.Status.Deprecated.V1Beta1 == nil && conditions != nil {
+	if o.Status.Deprecated.V1Beta1 == nil {
 		o.Status.Deprecated.V1Beta1 = &Phase2ObjStatusDeprecatedV1Beta1{}
 	}
 	o.Status.Deprecated.V1Beta1.Conditions = conditions

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ func (c *Cluster) GetV1Beta2Conditions() []metav1.Condition {`
`651`	`651`
`652`	`652`	`// SetV1Beta2Conditions sets conditions for an API object.`
`653`	`653`	`func (c *Cluster) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`654`		`- if c.Status.V1Beta2 == nil && conditions != nil {`
	`654`	`+ if c.Status.V1Beta2 == nil {`
`655`	`655`	`c.Status.V1Beta2 = &ClusterV1Beta2Status{}`
`656`	`656`	`}`
`657`	`657`	`c.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -1021,7 +1021,7 @@ func (c *ClusterClass) GetV1Beta2Conditions() []metav1.Condition {`
`1021`	`1021`
`1022`	`1022`	`// SetV1Beta2Conditions sets conditions for an API object.`
`1023`	`1023`	`func (c *ClusterClass) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`1024`		`- if c.Status.V1Beta2 == nil && conditions != nil {`
	`1024`	`+ if c.Status.V1Beta2 == nil {`
`1025`	`1025`	`c.Status.V1Beta2 = &ClusterClassV1Beta2Status{}`
`1026`	`1026`	`}`
`1027`	`1027`	`c.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ func (m *Machine) GetV1Beta2Conditions() []metav1.Condition {`
`645`	`645`
`646`	`646`	`// SetV1Beta2Conditions sets conditions for an API object.`
`647`	`647`	`func (m *Machine) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`648`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`648`	`+ if m.Status.V1Beta2 == nil {`
`649`	`649`	`m.Status.V1Beta2 = &MachineV1Beta2Status{}`
`650`	`650`	`}`
`651`	`651`	`m.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ func (m *MachineDeployment) GetV1Beta2Conditions() []metav1.Condition {`
`550`	`550`
`551`	`551`	`// SetV1Beta2Conditions sets conditions for an API object.`
`552`	`552`	`func (m *MachineDeployment) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`553`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`553`	`+ if m.Status.V1Beta2 == nil {`
`554`	`554`	`m.Status.V1Beta2 = &MachineDeploymentV1Beta2Status{}`
`555`	`555`	`}`
`556`	`556`	`m.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func (m *MachineHealthCheck) GetV1Beta2Conditions() []metav1.Condition {`
`224`	`224`
`225`	`225`	`// SetV1Beta2Conditions sets conditions for an API object.`
`226`	`226`	`func (m *MachineHealthCheck) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`227`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`227`	`+ if m.Status.V1Beta2 == nil {`
`228`	`228`	`m.Status.V1Beta2 = &MachineHealthCheckV1Beta2Status{}`
`229`	`229`	`}`
`230`	`230`	`m.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ func (m *MachineSet) GetV1Beta2Conditions() []metav1.Condition {`
`365`	`365`
`366`	`366`	`// SetV1Beta2Conditions sets conditions for an API object.`
`367`	`367`	`func (m *MachineSet) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`368`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`368`	`+ if m.Status.V1Beta2 == nil {`
`369`	`369`	`m.Status.V1Beta2 = &MachineSetV1Beta2Status{}`
`370`	`370`	`}`
`371`	`371`	`m.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ func (c *KubeadmConfig) GetV1Beta2Conditions() []metav1.Condition {`
`501`	`501`
`502`	`502`	`// SetV1Beta2Conditions sets conditions for an API object.`
`503`	`503`	`func (c *KubeadmConfig) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`504`		`- if c.Status.V1Beta2 == nil && conditions != nil {`
	`504`	`+ if c.Status.V1Beta2 == nil {`
`505`	`505`	`c.Status.V1Beta2 = &KubeadmConfigV1Beta2Status{}`
`506`	`506`	`}`
`507`	`507`	`c.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ func (in *KubeadmControlPlane) GetV1Beta2Conditions() []metav1.Condition {`
`428`	`428`
`429`	`429`	`// SetV1Beta2Conditions sets conditions for an API object.`
`430`	`430`	`func (in *KubeadmControlPlane) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`431`		`- if in.Status.V1Beta2 == nil && conditions != nil {`
	`431`	`+ if in.Status.V1Beta2 == nil {`
`432`	`432`	`in.Status.V1Beta2 = &KubeadmControlPlaneV1Beta2Status{}`
`433`	`433`	`}`
`434`	`434`	`in.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func (m *ClusterResourceSet) GetV1Beta2Conditions() []metav1.Condition {`
`141`	`141`
`142`	`142`	`// SetV1Beta2Conditions sets conditions for an API object.`
`143`	`143`	`func (m *ClusterResourceSet) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`144`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`144`	`+ if m.Status.V1Beta2 == nil {`
`145`	`145`	`m.Status.V1Beta2 = &ClusterResourceSetV1Beta2Status{}`
`146`	`146`	`}`
`147`	`147`	`m.Status.V1Beta2.Conditions = conditions`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func (m *MachinePool) GetV1Beta2Conditions() []metav1.Condition {`
`283`	`283`
`284`	`284`	`// SetV1Beta2Conditions sets conditions for an API object.`
`285`	`285`	`func (m *MachinePool) SetV1Beta2Conditions(conditions []metav1.Condition) {`
`286`		`- if m.Status.V1Beta2 == nil && conditions != nil {`
	`286`	`+ if m.Status.V1Beta2 == nil {`
`287`	`287`	`m.Status.V1Beta2 = &MachinePoolV1Beta2Status{}`
`288`	`288`	`}`
`289`	`289`	`m.Status.V1Beta2.Conditions = conditions`