fix: improve readability

Signed-off-by: Eduardo Rodrigues <[email protected]>
argoproj · Nov 14, 2024 · 4d59350 · 4d59350
1 parent 31a73fd
commit 4d59350
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/workflow/common/convert.go b/workflow/common/convert.go
@@ -90,13 +90,6 @@ func toWorkflow(cronWf wfv1.CronWorkflow, objectMeta metav1.ObjectMeta) *wfv1.Wo
 	}
 
 	wf.Labels[LabelKeyCronWorkflow] = cronWf.Name
-	if wf.Spec.WorkflowTemplateRef != nil {
-		if wf.Spec.WorkflowTemplateRef.ClusterScope {
-			wf.Labels[LabelKeyClusterWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
-		} else {
-			wf.Labels[LabelKeyWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
-		}
-	}
 	if cronWf.Spec.WorkflowMetadata != nil {
 		for key, label := range cronWf.Spec.WorkflowMetadata.Labels {
 			wf.Labels[key] = label

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -4133,15 +4133,17 @@ func setWfPodNamesAnnotation(wf *wfv1.Workflow) {
 }
 
 func setWfTemplateLabel(wf *wfv1.Workflow) {
-	if wf.Spec.WorkflowTemplateRef != nil {
-		if wf.ObjectMeta.Labels == nil {
-			wf.ObjectMeta.Labels = map[string]string{}
-		}
-		if wf.Spec.WorkflowTemplateRef.ClusterScope {
-			wf.ObjectMeta.Labels[common.LabelKeyClusterWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
-		} else {
-			wf.ObjectMeta.Labels[common.LabelKeyWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
-		}
+	if wf.Spec.WorkflowTemplateRef == nil {
+		return
+	}
+	if wf.ObjectMeta.Labels == nil {
+		wf.ObjectMeta.Labels = map[string]string{}
+	}
+
+	if wf.Spec.WorkflowTemplateRef.ClusterScope {
+		wf.ObjectMeta.Labels[common.LabelKeyClusterWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
+	} else {
+		wf.ObjectMeta.Labels[common.LabelKeyWorkflowTemplate] = wf.Spec.WorkflowTemplateRef.Name
 	}
 }