Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha)

lalitc375 · k8s-publishing-bot · commit b414b941d8cf · 2026-03-20T08:20:51.000Z
Kubernetes-commit: d8a562b6476439fda82827fe1641dc2e307bc52d
diff --git a/pkg/api/validate/union_test.go b/pkg/api/validate/union_test.go
@@ -239,7 +239,7 @@ func TestUnionRatcheting(t *testing.T) {
 			newStruct: &testStruct{},
 			expected: field.ErrorList{
 				field.Invalid(nil, "", "must specify one of: `m1`, `m2`, `m3`, `m4`"),
-			}.WithOrigin("union"),
+			},
 		},
 		{
 			name:      "both empty struct",
@@ -268,7 +268,7 @@ func TestUnionRatcheting(t *testing.T) {
 			},
 			expected: field.ErrorList{
 				field.Invalid(nil, "{m1, m2}", "must specify exactly one of: `m1`, `m2`, `m3`, `m4`"),
-			}.WithOrigin("union"),
+			},
 		},
 		{
 			name:      "slice member ratcheting: unchanged membership",
@@ -286,15 +286,15 @@ func TestUnionRatcheting(t *testing.T) {
 			newStruct: &testStruct{M3: []string{}},
 			expected: field.ErrorList{
 				field.Invalid(nil, "", "must specify one of: `m1`, `m2`, `m3`, `m4`"),
-			}.WithOrigin("union"),
+			},
 		},
 		{
 			name:      "empty map is not set",
 			oldStruct: nil,
 			newStruct: &testStruct{M4: map[string]string{}},
 			expected: field.ErrorList{
 				field.Invalid(nil, "", "must specify one of: `m1`, `m2`, `m3`, `m4`"),
-			}.WithOrigin("union"),
+			},
 		},
 	}
 
@@ -454,7 +454,7 @@ func TestDiscriminatedUnionRatcheting(t *testing.T) {
 			},
 			expected: field.ErrorList{
 				field.Invalid(field.NewPath("m3"), "", "must be specified when `d` is \"m3\""),
-			}.WithOrigin("union"),
+			},
 		},
 		{
 			name: "empty map is not set",
@@ -468,7 +468,7 @@ func TestDiscriminatedUnionRatcheting(t *testing.T) {
 			},
 			expected: field.ErrorList{
 				field.Invalid(field.NewPath("m4"), "", "must be specified when `d` is \"m4\""),
-			}.WithOrigin("union"),
+			},
 		},
 	}
 
