Ephemeral Cluster Controller: Name ProwJob after EphemeralCluster name

pkg/api/ephemeralcluster/v1/types.go

@@ -37,10 +37,8 @@ const (
 	EventReasonProwJobSucceeded      = "ProwJobSucceeded"
 	EventReasonProwJobAborted        = "ProwJobAborted"
 
-	KonfluxClusterAnnotation  = "ephemeralcluster.ci.openshift.io/konflux-cluster"
-	KonfluxTenantAnnotation   = "ephemeralcluster.ci.openshift.io/konflux-tenant"
-	PipelineRunNameAnnotation = "ephemeralcluster.ci.openshift.io/pipeline-run-name"
-	TaskRunNameAnnotation     = "ephemeralcluster.ci.openshift.io/task-run-name"
+	KonfluxClusterAnnotation = "ephemeralcluster.ci.openshift.io/konflux-cluster"
+	KonfluxTenantAnnotation  = "ephemeralcluster.ci.openshift.io/konflux-tenant"
 )
 
 // Conditions
@@ -100,20 +98,6 @@ func (ec *EphemeralCluster) KonfluxTenant() string {
 	return ""
 }
 
-func (ec *EphemeralCluster) PipelineRunName() string {
-	if value, ok := ec.Annotations[PipelineRunNameAnnotation]; ok {
-		return value
-	}
-	return ""
-}
-
-func (ec *EphemeralCluster) TaskRunName() string {
-	if value, ok := ec.Annotations[TaskRunNameAnnotation]; ok {
-		return value
-	}
-	return ""
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type EphemeralClusterList struct {
 	metav1.TypeMeta `json:",inline"`

pkg/controller/ephemeralcluster/reconciler.go

@@ -39,7 +39,6 @@ import (
 
 	"github.com/openshift/ci-tools/pkg/api"
 	ephemeralclusterv1 "github.com/openshift/ci-tools/pkg/api/ephemeralcluster/v1"
-	"github.com/openshift/ci-tools/pkg/jobconfig"
 	"github.com/openshift/ci-tools/pkg/load/agents"
 	"github.com/openshift/ci-tools/pkg/prowgen"
 	"github.com/openshift/ci-tools/pkg/steps"
@@ -601,21 +600,8 @@ func (r *reconciler) createProwJob(ctx context.Context, log *logrus.Entry, ec *e
 	return nil
 }
 
-func (r *reconciler) prowJobName(periodic *prowconfig.Periodic, ec *ephemeralclusterv1.EphemeralCluster) (string, error) {
-	if pipelineRunName := ec.PipelineRunName(); pipelineRunName != "" {
-		return ProwJobNamePrefix + "-ci-" + pipelineRunName, nil
-	}
-
-	if taskRunName := ec.TaskRunName(); taskRunName != "" {
-		return ProwJobNamePrefix + "-ci-" + taskRunName, nil
-	}
-
-	jobNameWithoutPrefix, prefixCut := strings.CutPrefix(periodic.JobBase.Name, jobconfig.PeriodicPrefix)
-	if !prefixCut {
-		return "", fmt.Errorf("failed to strip %s prefix from %s", jobconfig.PeriodicPrefix, periodic.JobBase.Name)
-	}
-
-	return ProwJobNamePrefix + jobNameWithoutPrefix, nil
+func (r *reconciler) prowJobName(ec *ephemeralclusterv1.EphemeralCluster) string {
+	return ProwJobNamePrefix + "-ci-" + ec.Name
 }
 
 func (r *reconciler) makeProwJob(ciOperatorConfig *api.ReleaseBuildConfiguration, ec *ephemeralclusterv1.EphemeralCluster) (*prowv1.ProwJob, error) {
@@ -637,12 +623,7 @@ func (r *reconciler) makeProwJob(ciOperatorConfig *api.ReleaseBuildConfiguration
 		return nil, fmt.Errorf("default periodic: %w", err)
 	}
 
-	pjName, err := r.prowJobName(periodic, ec)
-	if err != nil {
-		return nil, fmt.Errorf("generate prowjob name: %w", err)
-	}
-
-	periodic.JobBase.Name = pjName
+	periodic.JobBase.Name = r.prowJobName(ec)
 	periodic.UtilityConfig.ExtraRefs = []prowv1.Refs{}
 
 	labels := make(map[string]string)

pkg/controller/ephemeralcluster/reconciler_test.go

@@ -181,9 +181,8 @@ func TestReconcileCreateProwJob(t *testing.T) {
 			ec: ephemeralclusterv1.EphemeralCluster{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						ephemeralclusterv1.KonfluxClusterAnnotation:  "kcluster",
-						ephemeralclusterv1.KonfluxTenantAnnotation:   "ktenant",
-						ephemeralclusterv1.PipelineRunNameAnnotation: "pipeline-run-name",
+						ephemeralclusterv1.KonfluxClusterAnnotation: "kcluster",
+						ephemeralclusterv1.KonfluxTenantAnnotation:  "ktenant",
 					},
 					Namespace: "ns",
 					Name:      "ec",
@@ -331,9 +330,6 @@ func TestReconcileCreateProwJob(t *testing.T) {
 			name: "Hive cluster request creates a ProwJob",
 			ec: ephemeralclusterv1.EphemeralCluster{
 				ObjectMeta: metav1.ObjectMeta{
-					Annotations: map[string]string{
-						ephemeralclusterv1.TaskRunNameAnnotation: "task-run-name",
-					},
 					Namespace: "ns",
 					Name:      "ec",
 				},

pkg/controller/ephemeralcluster/testdata/zz_fixture_ec_TestReconcileCreateProwJob_An_EphemeralCluster_request_creates_a_ProwJob.yaml

@@ -2,7 +2,6 @@ metadata:
   annotations:
     ephemeralcluster.ci.openshift.io/konflux-cluster: kcluster
     ephemeralcluster.ci.openshift.io/konflux-tenant: ktenant
-    ephemeralcluster.ci.openshift.io/pipeline-run-name: pipeline-run-name
   finalizers:
   - ephemeralcluster.ci.openshift.io/dependent-prowjob
   name: ec

pkg/controller/ephemeralcluster/testdata/zz_fixture_ec_TestReconcileCreateProwJob_Hive_cluster_request_creates_a_ProwJob.yaml

@@ -1,6 +1,4 @@
 metadata:
-  annotations:
-    ephemeralcluster.ci.openshift.io/task-run-name: task-run-name
   finalizers:
   - ephemeralcluster.ci.openshift.io/dependent-prowjob
   name: ec

pkg/controller/ephemeralcluster/testdata/zz_fixture_pj_TestReconcileCreateProwJob_An_EphemeralCluster_request_creates_a_ProwJob.yaml

@@ -2,15 +2,15 @@ items:
 - metadata:
     annotations:
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-pipeline-run-name
+      prow.k8s.io/job: ephemeralcluster-ci-ec
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/ephemeral-cluster: ec
       created-by-prow: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-pipeline-run-name
+      prow.k8s.io/job: ephemeralcluster-ci-ec
       prow.k8s.io/type: periodic
     name: foobar
     namespace: ci
@@ -29,7 +29,7 @@ items:
         entrypoint: entrypoint
         initupload: initupload
         sidecar: sidecar
-    job: ephemeralcluster-ci-pipeline-run-name
+    job: ephemeralcluster-ci-ec
     namespace: ci
     pod_spec:
       containers:

pkg/controller/ephemeralcluster/testdata/zz_fixture_pj_TestReconcileCreateProwJob_Hive_cluster_request_creates_a_ProwJob.yaml

@@ -2,13 +2,13 @@ items:
 - metadata:
     annotations:
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-task-run-name
+      prow.k8s.io/job: ephemeralcluster-ci-ec
     labels:
       ci.openshift.io/ephemeral-cluster: ec
       created-by-prow: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-task-run-name
+      prow.k8s.io/job: ephemeralcluster-ci-ec
       prow.k8s.io/type: periodic
     name: foobar
     namespace: ci
@@ -27,7 +27,7 @@ items:
         entrypoint: entrypoint
         initupload: initupload
         sidecar: sidecar
-    job: ephemeralcluster-ci-task-run-name
+    job: ephemeralcluster-ci-ec
     namespace: ci
     pod_spec:
       containers:

pkg/controller/ephemeralcluster/testdata/zz_fixture_pj_TestReconcileCreateProwJob_Privileged_tenant.yaml

@@ -2,15 +2,15 @@ items:
 - metadata:
     annotations:
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-org-repo-branch-cluster-provisioning
+      prow.k8s.io/job: ephemeralcluster-ci-ec
     labels:
       ci-operator.openshift.io/cloud: aws
       ci-operator.openshift.io/cloud-cluster-profile: aws
       ci.openshift.io/ephemeral-cluster: ec
       created-by-prow: "true"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
       prow.k8s.io/context: ""
-      prow.k8s.io/job: ephemeralcluster-ci-org-repo-branch-cluster-provisioning
+      prow.k8s.io/job: ephemeralcluster-ci-ec
       prow.k8s.io/type: periodic
     name: foobar
     namespace: ci
@@ -29,7 +29,7 @@ items:
         entrypoint: entrypoint
         initupload: initupload
         sidecar: sidecar
-    job: ephemeralcluster-ci-org-repo-branch-cluster-provisioning
+    job: ephemeralcluster-ci-ec
     namespace: ci
     pod_spec:
       containers: