From 502c0dade1d3825cd253f412f639b16a4c52e55c Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Tue, 20 Jan 2026 16:56:50 -0500 Subject: [PATCH] UPSTREAM: : Revert "Merge pull request #594 from ehearne-redhat/add-service-account-curl-job" This reverts commit eccd75916a561138118d5dde09058f66d7f904ad, reversing changes made to dcbfaf2c78cac8f77a716980149f43ea507b85f5. --- .../tests-extension/test/olmv1-catalog.go | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/openshift/tests-extension/test/olmv1-catalog.go b/openshift/tests-extension/test/olmv1-catalog.go index ee1a0cb46..cba96594b 100644 --- a/openshift/tests-extension/test/olmv1-catalog.go +++ b/openshift/tests-extension/test/olmv1-catalog.go @@ -11,7 +11,6 @@ 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" @@ -78,42 +77,12 @@ func verifyCatalogEndpoint(ctx SpecContext, catalog, endpoint, query string) { strings.ReplaceAll(endpoint, "?", ""), strings.ReplaceAll(catalog, "-", "")) - // create service account object - serviceAccount := &corev1.ServiceAccount{ - ObjectMeta: metav1.ObjectMeta{ - Name: jobNamePrefix, - Namespace: "default", - }, - } - - serviceAccount.SetName(jobNamePrefix) - serviceAccount.SetNamespace("default") - - err = k8sClient.Create(ctx, serviceAccount) - Expect(err).NotTo(HaveOccurred(), "failed to create Service Account") - - DeferCleanup(func(ctx SpecContext) { - _ = k8sClient.Delete(ctx, serviceAccount) - }) - - if err != nil && !apierrors.IsAlreadyExists(err) { - Fail(fmt.Sprintf("Failed to ensure ServiceAccount %s: %v", jobNamePrefix, err)) - } - - job := buildCurlJob(jobNamePrefix, "default", serviceURL, serviceAccount) + job := buildCurlJob(jobNamePrefix, "default", serviceURL) err = k8sClient.Create(ctx, job) Expect(err).NotTo(HaveOccurred(), "failed to create Job") DeferCleanup(func(ctx SpecContext) { - By("Deleting Job and waiting for pods to terminate") _ = k8sClient.Delete(ctx, job) - - // Wait for Job to be fully deleted. - Eventually(func() bool { - checkJob := &batchv1.Job{} - err := k8sClient.Get(ctx, client.ObjectKeyFromObject(job), checkJob) - return apierrors.IsNotFound(err) - }).WithTimeout(helpers.DefaultTimeout).WithPolling(helpers.DefaultPolling).Should(BeTrue()) }) By("Waiting for Job to succeed") @@ -259,7 +228,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 }) }) -func buildCurlJob(prefix, namespace, url string, serviceAccount *corev1.ServiceAccount) *batchv1.Job { +func buildCurlJob(prefix, namespace, url 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. @@ -288,8 +257,7 @@ func buildCurlJob(prefix, namespace, url string, serviceAccount *corev1.ServiceA BackoffLimit: &backoff, Template: corev1.PodTemplateSpec{ Spec: corev1.PodSpec{ - ServiceAccountName: serviceAccount.Name, - RestartPolicy: corev1.RestartPolicyNever, + RestartPolicy: corev1.RestartPolicyNever, Containers: []corev1.Container{{ Name: "api-tester", Image: "registry.redhat.io/rhel8/httpd-24:latest",