fix

Author: prakash100198

pkg/pipeline/WorkflowService.go

@@ -165,8 +165,6 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *types.W
 		impl.Logger.Errorw("error occurred while getting workflow main container", "err", err)
 		return bean3.WorkflowTemplate{}, err
 	}
-	// if anyone wants to add extra labels in workflow template then leverage below func.
-	workflowRequest.AddExtraLabelsInWorkflowTemplate()
 	workflowTemplate.Containers = []v12.Container{workflowMainContainer}
 	impl.updateBlobStorageConfig(workflowRequest, &workflowTemplate)
 	if workflowRequest.Type == bean3.CI_WORKFLOW_PIPELINE_TYPE || workflowRequest.Type == bean3.JOB_WORKFLOW_PIPELINE_TYPE {

pkg/pipeline/bean/WorkflowTemplate.go

@@ -50,13 +50,14 @@ type WorkflowTemplate struct {
 }
 
 const (
-	CI_WORKFLOW_NAME        = "ci"
-	CI_WORKFLOW_WITH_STAGES = "ci-stages-with-env"
-	CiStage                 = "CI"
-	JobStage                = "JOB"
-	CdStage                 = "CD"
-	CD_WORKFLOW_NAME        = "cd"
-	CD_WORKFLOW_WITH_STAGES = "cd-stages-with-env"
+	CI_WORKFLOW_NAME           = "ci"
+	CI_WORKFLOW_WITH_STAGES    = "ci-stages-with-env"
+	CiStage                    = "CI"
+	JobStage                   = "JOB"
+	CdStage                    = "CD"
+	CD_WORKFLOW_NAME           = "cd"
+	CD_WORKFLOW_WITH_STAGES    = "cd-stages-with-env"
+	WorkflowGenerateNamePrefix = "devtron.ai/generate-name-prefix"
 )
 
 func (workflowTemplate *WorkflowTemplate) GetEntrypoint() string {
@@ -72,17 +73,20 @@ func (workflowTemplate *WorkflowTemplate) GetEntrypoint() string {
 
 func (workflowTemplate *WorkflowTemplate) CreateObjectMetadata() *v12.ObjectMeta {
 
+	workflowLabels := map[string]string{WorkflowGenerateNamePrefix: workflowTemplate.WorkflowNamePrefix}
 	switch workflowTemplate.WorkflowType {
 	case CI_WORKFLOW_NAME:
+		workflowLabels["devtron.ai/workflow-purpose"] = "ci"
 		return &v12.ObjectMeta{
 			GenerateName: workflowTemplate.WorkflowNamePrefix + "-",
-			Labels:       map[string]string{"devtron.ai/workflow-purpose": "ci"},
+			Labels:       workflowLabels,
 		}
 	case CD_WORKFLOW_NAME:
+		workflowLabels["devtron.ai/workflow-purpose"] = "cd"
 		return &v12.ObjectMeta{
 			GenerateName: workflowTemplate.WorkflowNamePrefix + "-",
 			Annotations:  map[string]string{"workflows.argoproj.io/controller-instanceid": workflowTemplate.WfControllerInstanceID},
-			Labels:       map[string]string{"devtron.ai/workflow-purpose": "cd"},
+			Labels:       workflowLabels,
 		}
 	default:
 		return nil

pkg/pipeline/executors/ArgoWorkflowExecutor.go

@@ -97,7 +97,7 @@ func (impl *ArgoWorkflowExecutorImpl) TerminateDanglingWorkflow(workflowGenerate
 		impl.logger.Errorw("cannot build wf client", "workflowGenerateName", workflowGenerateName, "err", err)
 		return err
 	}
-	jobSelectorLabel := fmt.Sprintf("%s=%s", types.WorkflowGenerateNamePrefix, workflowGenerateName)
+	jobSelectorLabel := fmt.Sprintf("%s=%s", bean.WorkflowGenerateNamePrefix, workflowGenerateName)
 	wfList, err := wfClient.List(context.Background(), v1.ListOptions{LabelSelector: jobSelectorLabel})
 	if err != nil {
 		impl.logger.Errorw("error in fetching list of workflows", "namespace", namespace, "err", err)

pkg/pipeline/executors/SystemWorkflowExecutor.go

@@ -120,7 +120,7 @@ func (impl *SystemWorkflowExecutorImpl) TerminateDanglingWorkflow(workflowGenera
 		impl.logger.Errorw("error occurred while creating k8s client", "workflowGenerateName", workflowGenerateName, "namespace", namespace, "err", err)
 		return err
 	}
-	jobSelectorLabel := fmt.Sprintf("%s=%s", types2.WorkflowGenerateNamePrefix, workflowGenerateName)
+	jobSelectorLabel := fmt.Sprintf("%s=%s", bean.WorkflowGenerateNamePrefix, workflowGenerateName)
 	jobList, err := clientset.BatchV1().Jobs(namespace).List(context.Background(), v12.ListOptions{LabelSelector: jobSelectorLabel})
 	if err != nil {
 		impl.logger.Errorw("error occurred while fetching jobs list for terminating dangling workflows", "namespace", namespace, "err", err)
@@ -185,8 +185,7 @@ func (impl *SystemWorkflowExecutorImpl) GetWorkflowStatus(workflowName string, n
 }
 
 func (impl *SystemWorkflowExecutorImpl) getJobTemplate(workflowTemplate bean.WorkflowTemplate) *v1.Job {
-
-	workflowLabels := map[string]string{DEVTRON_WORKFLOW_LABEL_KEY: DEVTRON_WORKFLOW_LABEL_VALUE, "devtron.ai/purpose": "workflow", "workflowType": workflowTemplate.WorkflowType}
+	workflowLabels := GetWorkflowLabelsForSystemExecutor(workflowTemplate)
 
 	//setting TerminationGracePeriodSeconds in PodSpec
 	//which ensures Pod has enough time to execute cleanup on SIGTERM event

pkg/pipeline/executors/WorkflowUtils.go

@@ -256,3 +256,12 @@ func CheckIfReTriggerRequired(status, message, workflowRunnerStatus string) bool
 
 const WorkflowCancel = "CANCELLED"
 const POD_DELETED_MESSAGE = "pod deleted"
+
+func GetWorkflowLabelsForSystemExecutor(workflowTemplate bean.WorkflowTemplate) map[string]string {
+	return map[string]string{
+		DEVTRON_WORKFLOW_LABEL_KEY:      DEVTRON_WORKFLOW_LABEL_VALUE,
+		"devtron.ai/purpose":            "workflow",
+		"workflowType":                  workflowTemplate.WorkflowType,
+		bean.WorkflowGenerateNamePrefix: workflowTemplate.WorkflowNamePrefix,
+	}
+}

pkg/pipeline/types/Workflow.go

@@ -151,10 +151,6 @@ type WorkflowRequest struct {
 	HostUrl                     string `json:"hostUrl"`
 }
 
-func (workflowRequest *WorkflowRequest) AddExtraLabelsInWorkflowTemplate() {
-	workflowRequest.AppLabels[WorkflowGenerateNamePrefix] = workflowRequest.WorkflowNamePrefix
-}
-
 func (workflowRequest *WorkflowRequest) updateExternalRunMetadata() {
 	pipeline := workflowRequest.Pipeline
 	env := workflowRequest.Env
@@ -598,7 +594,6 @@ const (
 	POST                        = "POST"
 	CI_NODE_PVC_ALL_ENV         = "devtron.ai/ci-pvc-all"
 	CI_NODE_PVC_PIPELINE_PREFIX = "devtron.ai/ci-pvc"
-	WorkflowGenerateNamePrefix  = "devtron.ai/generate-name-prefix"
 )
 
 type CiArtifactDTO struct {