Merge 9c9671e into f4e578e

caicloud · Jan 20, 2021 · 6ce5f73 · 6ce5f73
2 parents f4e578e + 9c9671e
commit 6ce5f73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/cyclone/templates/server.yaml b/manifests/cyclone/templates/server.yaml
@@ -193,5 +193,5 @@ spec:
       storage: 10Gi
     requests:
       storage: 10Gi
-  storageClassName: heketi-storageclass
+  storageClassName: platform-storageclass
   volumeMode: Filesystem
diff --git a/pkg/server/handler/v1alpha1/webhook.go b/pkg/server/handler/v1alpha1/webhook.go
@@ -306,11 +306,13 @@ func createWorkflowRun(tenant string, wft v1alpha1.WorkflowTrigger, data *scm.Ev
 				meta.LabelProjectName:             project,
 				meta.LabelWorkflowName:            wfName,
 				meta.LabelWorkflowRunAcceleration: wft.Labels[meta.LabelWorkflowRunAcceleration],
-				meta.LabelWorkflowRunPRRef:        ref,
 			},
 		},
 		Spec: wft.Spec.WorkflowRunSpec,
 	}
+	if cancelPrevious {
+		wfr.ObjectMeta.Labels[meta.LabelWorkflowRunPRRef] = ref
+	}
 
 	wfr.Annotations, err = setSCMEventData(wfr.Annotations, data)
 	if err != nil {