Merge pull request #2069 from dgoodwin/validating-admission-fieldmanager

openshift-merge-bot[bot] · web-flow · commit 191249b6c0b7 · 2024-08-30T23:14:49.000Z
OCPBUGS-39004: UPSTREAM: 126994: Add required FieldManager for validatingadmissionpolicy e2e
diff --git a/test/e2e/apimachinery/validatingadmissionpolicy.go b/test/e2e/apimachinery/validatingadmissionpolicy.go
@@ -370,7 +370,7 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func(
 							"touched": time.Now().String(),
 							"random":  fmt.Sprintf("%d", rand.Int()),
 						})
-						_, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Apply(ctx, applyConfig, metav1.ApplyOptions{})
+						_, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Apply(ctx, applyConfig, metav1.ApplyOptions{FieldManager: "validatingadmissionpolicy-e2e"})
 						return false, err
 					}
 					return true, nil

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func(`
`370`	`370`	`"touched": time.Now().String(),`
`371`	`371`	`"random": fmt.Sprintf("%d", rand.Int()),`
`372`	`372`	`})`
`373`		`- _, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Apply(ctx, applyConfig, metav1.ApplyOptions{})`
	`373`	`+ _, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Apply(ctx, applyConfig, metav1.ApplyOptions{FieldManager: "validatingadmissionpolicy-e2e"})`
`374`	`374`	`return false, err`
`375`	`375`	`}`
`376`	`376`	`return true, nil`