From 44e5264aa06f242fd80e73519e5d5a25c53ab779 Mon Sep 17 00:00:00 2001 From: Evan Hearne Date: Mon, 2 Mar 2026 11:26:53 +0000 Subject: [PATCH] UPSTREAM: : add service account to curl job --- .../tests-extension/test/olmv1-catalog.go | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/openshift/tests-extension/test/olmv1-catalog.go b/openshift/tests-extension/test/olmv1-catalog.go index 5e1bfab1b..75c3510b2 100644 --- a/openshift/tests-extension/test/olmv1-catalog.go +++ b/openshift/tests-extension/test/olmv1-catalog.go @@ -11,6 +11,7 @@ import ( batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -76,12 +77,40 @@ func verifyCatalogEndpoint(ctx SpecContext, catalog, endpoint, query string) { strings.ReplaceAll(endpoint, "?", ""), strings.ReplaceAll(catalog, "-", "")) - job := buildCurlJob(jobNamePrefix, "default", serviceURL) + // Create the ServiceAccount first + serviceAccount := &corev1.ServiceAccount{ + ObjectMeta: metav1.ObjectMeta{ + Name: jobNamePrefix, + Namespace: "default", + }, + } + + err = k8sClient.Create(ctx, serviceAccount) + Expect(err).NotTo(HaveOccurred(), "failed to create ServiceAccount") + + // Create the Job + job := buildCurlJob(jobNamePrefix, "default", serviceURL, serviceAccount.Name) err = k8sClient.Create(ctx, job) Expect(err).NotTo(HaveOccurred(), "failed to create Job") DeferCleanup(func(ctx SpecContext) { - _ = k8sClient.Delete(ctx, job) + // Force delete job with zero grace period to ensure cleanup doesn't hang + // Use Foreground propagation to ensure Pods are deleted before the Job is removed, + // guaranteeing the ServiceAccount isn't deleted while Pods are still using it + deletePolicy := metav1.DeletePropagationForeground + gracePeriod := int64(0) + err := k8sClient.Delete(ctx, job, &client.DeleteOptions{ + GracePeriodSeconds: &gracePeriod, + PropagationPolicy: &deletePolicy, + }) + if err != nil && !apierrors.IsNotFound(err) { + Expect(err).NotTo(HaveOccurred(), "failed to delete Job") + } + Eventually(func(g Gomega) { + err := k8sClient.Get(ctx, client.ObjectKeyFromObject(job), &batchv1.Job{}) + g.Expect(err).To(HaveOccurred()) + }).WithTimeout(helpers.DefaultTimeout).WithPolling(helpers.DefaultPolling).Should(Succeed()) + _ = k8sClient.Delete(ctx, serviceAccount) }) By("Waiting for Job to succeed") @@ -203,7 +232,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 }) }) -func buildCurlJob(prefix, namespace, url string) *batchv1.Job { +func buildCurlJob(prefix, namespace, url, serviceAccountName string) *batchv1.Job { backoff := int32(1) // This means the k8s garbage collector will automatically delete the job 5 minutes // after it has completed or failed. @@ -232,7 +261,8 @@ func buildCurlJob(prefix, namespace, url string) *batchv1.Job { BackoffLimit: &backoff, Template: corev1.PodTemplateSpec{ Spec: corev1.PodSpec{ - RestartPolicy: corev1.RestartPolicyNever, + ServiceAccountName: serviceAccountName, + RestartPolicy: corev1.RestartPolicyNever, Containers: []corev1.Container{{ Name: "api-tester", Image: "registry.redhat.io/rhel8/httpd-24:latest",