Skip to content

[WIP] OCPBUGS-65634: add service account to curl job #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ehearne-redhat wants to merge 5 commits into
base: main
Choose a base branch
from
+35 −3
Open

[WIP] OCPBUGS-65634: add service account to curl job #594

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5097073
UPSTREAM: <carry>: add service account to curl job
ehearne-redhat Jan 7, 2026
b297ef7
UPSTREAM: <carry>: move sa creation out of buildCurlJob()
ehearne-redhat Jan 8, 2026
e596858
UPSTREAM: <carry>: comment out delete service account
ehearne-redhat Jan 9, 2026
5d0731f
UPSTREAM: <carry>: move defercleanup for sa for LIFO
ehearne-redhat Jan 9, 2026
47e7072
UPSTREAM: <carry>: add polling so job fully deleted before proceed
ehearne-redhat Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions openshift/tests-extension/test/olmv1-catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -77,12 +78,42 @@ func verifyCatalogEndpoint(ctx SpecContext, catalog, endpoint, query string) {
strings.ReplaceAll(endpoint, "?", ""),
strings.ReplaceAll(catalog, "-", ""))

job := buildCurlJob(jobNamePrefix, "default", serviceURL)
// 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)
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")
Expand Down Expand Up @@ -228,7 +259,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1
})
})

func buildCurlJob(prefix, namespace, url string) *batchv1.Job {
func buildCurlJob(prefix, namespace, url string, serviceAccount *corev1.ServiceAccount) *batchv1.Job {
backoff := int32(1)
// This means the k8s garbage collector will automatically delete the job 5 minutes
// after it has completed or failed.
Expand Down Expand Up @@ -257,7 +288,8 @@ func buildCurlJob(prefix, namespace, url string) *batchv1.Job {
BackoffLimit: &backoff,
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
RestartPolicy: corev1.RestartPolicyNever,
ServiceAccountName: serviceAccount.Name,
RestartPolicy: corev1.RestartPolicyNever,
Containers: []corev1.Container{{
Name: "api-tester",
Image: "registry.redhat.io/rhel8/httpd-24:latest",
Expand Down