fix: makefile and common variable

Signed-off-by: Saravanan Balasubramanian <[email protected]>

Author: terrytangyuan

Makefile

@@ -576,14 +576,9 @@ validate-examples: api/jsonschema/schema.json
 	cd examples && go test
 
 # pre-push
-
-<<<<<<< HEAD
-.PHONY: pre-commit
-pre-commit: codegen lint test start
-=======
 .git/hooks/commit-msg: hack/git/hooks/commit-msg
 	cp -v hack/git/hooks/commit-msg .git/hooks/commit-msg
->>>>>>> 0fb104481... build: prevent bad commit messages, fix broken builds (#7086)
+
 
 .PHONY: githooks
 githooks: .git/hooks/commit-msg

workflow/common/common.go

@@ -75,6 +75,13 @@ const (
 	// LabelKeyOnExit is a label applied to Pods that are run from onExit nodes, so that they are not shut down when stopping a Workflow
 	LabelKeyOnExit = workflow.WorkflowFullName + "/on-exit"
 
+	// LabelKeyConfigMapType is the label key for the type of configmap.
+	LabelKeyConfigMapType = "workflows.argoproj.io/configmap-type"
+	// LabelValueTypeConfigMapCache is a key for configmaps that are memoization cache.
+	LabelValueTypeConfigMapCache = "Cache"
+	// LabelValueTypeConfigMapParameter is a key for configmaps that contains parameter values.
+	LabelValueTypeConfigMapParameter = "Parameter"
+
 	// ExecutorArtifactBaseDir is the base directory in the init container in which artifacts will be copied to.
 	// Each artifact will be named according to its input name (e.g: /argo/inputs/artifacts/CODE)
 	ExecutorArtifactBaseDir = "/argo/inputs/artifacts"