From 71c0639983de7a86c9a776e7efbb0199c53f4b25 Mon Sep 17 00:00:00 2001 From: Shaza Aldawamneh Date: Thu, 17 Oct 2024 13:55:23 +0200 Subject: [PATCH] UPSTREAM: 128263: CRD type check test fix Co-authored-by: Ben Luddy --- test/e2e/apimachinery/validatingadmissionpolicy.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/e2e/apimachinery/validatingadmissionpolicy.go b/test/e2e/apimachinery/validatingadmissionpolicy.go index e2fdb3ebe5db9..5f4d0bbbea324 100644 --- a/test/e2e/apimachinery/validatingadmissionpolicy.go +++ b/test/e2e/apimachinery/validatingadmissionpolicy.go @@ -366,10 +366,15 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func( // TODO(#123829) Remove once the schema watcher is merged. // If the warnings are empty, touch the policy to retry type checking if len(policy.Status.TypeChecking.ExpressionWarnings) == 0 { - applyConfig := applyadmissionregistrationv1.ValidatingAdmissionPolicy(policy.Name).WithLabels(map[string]string{ - "touched": fmt.Sprintf("a%d", time.Now().UnixMilli()), - "random": fmt.Sprintf("a%d", rand.Int()), - }) + randomValue := fmt.Sprintf(`"%d"`, rand.Int()) + // Use a fixed key and change only the value + applyConfig := applyadmissionregistrationv1.ValidatingAdmissionPolicy(policy.Name). + WithSpec(applyadmissionregistrationv1.ValidatingAdmissionPolicySpec(). + WithAuditAnnotations(applyadmissionregistrationv1.AuditAnnotation(). + WithKey("key"). + WithValueExpression(randomValue), + ), + ) _, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Apply(ctx, applyConfig, metav1.ApplyOptions{FieldManager: "validatingadmissionpolicy-e2e"}) return false, err }