Merge pull request #12484 from sbueringer/pr-extend-test-cov-bool

k8s-ci-robot · web-flow · commit 00831e484050 · 2025-07-14T03:08:23.000-07:00
🌱 Extend topology upgrade test: add bool removal test case
diff --git a/internal/topology/upgrade/clusterctl_upgrade_test.go b/internal/topology/upgrade/clusterctl_upgrade_test.go
@@ -294,6 +294,8 @@ func createT1ClusterClass(g *WithT, ns *corev1.Namespace, ct1 client.Client) *cl
 					PtrStringToString:  ptr.To("Something"),
 					Int32ToPtrInt32:    int32(4),
 					DurationToPtrInt32: metav1.Duration{Duration: 5 * time.Second},
+					// Note: BoolRemoved tests if the removal of KubeadmConfig UseExperimentalRetryJoin triggers rollouts.
+					BoolRemoved: true,
 					StructWithOnlyOptionalFields: testt1v1beta1.StructWithOnlyOptionalFields{
 						A: "Something",
 					},
diff --git a/internal/topology/upgrade/test/t1/crd/test.cluster.x-k8s.io_testresources.yaml b/internal/topology/upgrade/test/t1/crd/test.cluster.x-k8s.io_testresources.yaml
@@ -39,6 +39,8 @@ spec:
           spec:
             description: TestResourceSpec defines the resource spec.
             properties:
+              boolRemoved:
+                type: boolean
               boolToPtrBool:
                 type: boolean
               durationToPtrInt32:
diff --git a/internal/topology/upgrade/test/t1/crd/test.cluster.x-k8s.io_testresourcetemplates.yaml b/internal/topology/upgrade/test/t1/crd/test.cluster.x-k8s.io_testresourcetemplates.yaml
@@ -46,6 +46,8 @@ spec:
                   spec:
                     description: TestResourceSpec defines the resource spec.
                     properties:
+                      boolRemoved:
+                        type: boolean
                       boolToPtrBool:
                         type: boolean
                       durationToPtrInt32:
diff --git a/internal/topology/upgrade/test/t1/v1beta1/types.go b/internal/topology/upgrade/test/t1/v1beta1/types.go
@@ -108,6 +108,9 @@ type TestResourceSpec struct {
 	// +optional
 	DurationToPtrInt32 metav1.Duration `json:"durationToPtrInt32,omitempty"`
 
+	// +optional
+	BoolRemoved bool `json:"boolRemoved,omitempty"`
+
 	// +optional
 	StructWithOnlyOptionalFields StructWithOnlyOptionalFields `json:"structWithOnlyOptionalFields,omitempty"`
 }
diff --git a/internal/topology/upgrade/test/t2/crd/test.cluster.x-k8s.io_testresources.yaml b/internal/topology/upgrade/test/t2/crd/test.cluster.x-k8s.io_testresources.yaml
@@ -39,6 +39,8 @@ spec:
           spec:
             description: TestResourceSpec defines the resource spec.
             properties:
+              boolRemoved:
+                type: boolean
               boolToPtrBool:
                 type: boolean
               durationToPtrInt32:
diff --git a/internal/topology/upgrade/test/t2/crd/test.cluster.x-k8s.io_testresourcetemplates.yaml b/internal/topology/upgrade/test/t2/crd/test.cluster.x-k8s.io_testresourcetemplates.yaml
@@ -46,6 +46,8 @@ spec:
                   spec:
                     description: TestResourceSpec defines the resource spec.
                     properties:
+                      boolRemoved:
+                        type: boolean
                       boolToPtrBool:
                         type: boolean
                       durationToPtrInt32:
diff --git a/internal/topology/upgrade/test/t2/v1beta1/conversion_test.go b/internal/topology/upgrade/test/t2/v1beta1/conversion_test.go
@@ -85,4 +85,7 @@ func spokeTestResourceSpec(in *TestResourceSpec, c randfill.Continue) {
 	if in.DurationToPtrInt32.Nanoseconds() != 0 {
 		in.DurationToPtrInt32 = metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second}
 	}
+
+	// Drop BoolRemoved as we intentionally don't preserve it.
+	in.BoolRemoved = false
 }
diff --git a/internal/topology/upgrade/test/t2/v1beta1/types.go b/internal/topology/upgrade/test/t2/v1beta1/types.go
@@ -103,6 +103,9 @@ type TestResourceSpec struct {
 	// +optional
 	DurationToPtrInt32 metav1.Duration `json:"durationToPtrInt32,omitempty"`
 
+	// +optional
+	BoolRemoved bool `json:"boolRemoved,omitempty"`
+
 	// +optional
 	StructWithOnlyOptionalFields StructWithOnlyOptionalFields `json:"structWithOnlyOptionalFields,omitempty"`
 }
diff --git a/internal/topology/upgrade/test/t2/v1beta1/zz_generated.conversion.go b/internal/topology/upgrade/test/t2/v1beta1/zz_generated.conversion.go

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ type TestResourceSpec struct {`
`108`	`108`	`// +optional`
`109`	`109`	DurationToPtrInt32 metav1.Duration `json:"durationToPtrInt32,omitempty"`
`110`	`110`
	`111`	`+ // +optional`
	`112`	+ BoolRemoved bool `json:"boolRemoved,omitempty"`
	`113`	`+`
`111`	`114`	`// +optional`
`112`	`115`	StructWithOnlyOptionalFields StructWithOnlyOptionalFields `json:"structWithOnlyOptionalFields,omitempty"`
`113`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,7 @@ func spokeTestResourceSpec(in *TestResourceSpec, c randfill.Continue) {`
`85`	`85`	`if in.DurationToPtrInt32.Nanoseconds() != 0 {`
`86`	`86`	`in.DurationToPtrInt32 = metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ // Drop BoolRemoved as we intentionally don't preserve it.`
	`90`	`+ in.BoolRemoved = false`
`88`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,9 @@ type TestResourceSpec struct {`
`103`	`103`	`// +optional`
`104`	`104`	DurationToPtrInt32 metav1.Duration `json:"durationToPtrInt32,omitempty"`
`105`	`105`
	`106`	`+ // +optional`
	`107`	+ BoolRemoved bool `json:"boolRemoved,omitempty"`
	`108`	`+`
`106`	`109`	`// +optional`
`107`	`110`	StructWithOnlyOptionalFields StructWithOnlyOptionalFields `json:"structWithOnlyOptionalFields,omitempty"`
`108`	`111`	`}`