fix: Restore default pod name version to v1 (argoproj#6998)

* fix: Restore default pod name version to v1 Signed-off-by: J.P. Zivalich <jp@pipekit.io> * Update ui test Signed-off-by: J.P. Zivalich <jp@pipekit.io> Signed-off-by: kriti-sc <kathuriakriti1@gmail.com>
kriti-sc · Oct 24, 2021 · 42ae746 · 42ae746
1 parent e341456
commit 42ae746
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/ui/src/app/shared/pod-name.test.ts b/ui/src/app/shared/pod-name.test.ts
@@ -27,9 +27,6 @@ describe('pod names', () => {
     });
 
     test('getPodName', () => {
-        expect(getPodName(shortWfName, nodeName, shortTemplateName, nodeID)).toEqual('wfname-templatename-1454367246');
-
-        const name = getPodName(longWfName, nodeName, longTemplateName, nodeID);
-        expect(name.length).toEqual(maxK8sResourceNameLength);
+        expect(getPodName(shortWfName, nodeName, shortTemplateName, nodeID)).toEqual(nodeID);
     });
 });
diff --git a/ui/src/app/shared/pod-name.ts b/ui/src/app/shared/pod-name.ts
@@ -3,15 +3,7 @@ export const k8sNamingHashLength = 10;
 
 // getPodName returns a deterministic pod name
 export const getPodName = (workflowName: string, nodeName: string, templateName: string, nodeID: string): string => {
-    if (workflowName === nodeName) {
-        return workflowName;
-    }
-
-    let prefix = `${workflowName}-${templateName}`;
-    prefix = ensurePodNamePrefixLength(prefix);
-
-    const hash = createFNVHash(nodeName);
-    return `${prefix}-${hash}`;
+    return nodeID;
 };
 
 export const ensurePodNamePrefixLength = (prefix: string): string => {

diff --git a/workflow/util/pod_name.go b/workflow/util/pod_name.go
@@ -13,20 +13,20 @@ const (
 
 // PodName return a deterministic pod name
 func PodName(workflowName, nodeName, templateName, nodeID string) string {
-	if os.Getenv("POD_NAMES") == "v1" {
-		return nodeID
-	}
+	if os.Getenv("POD_NAMES") == "v2" {
+		if workflowName == nodeName {
+			return workflowName
+		}
 
-	if workflowName == nodeName {
-		return workflowName
-	}
+		prefix := fmt.Sprintf("%s-%s", workflowName, templateName)
+		prefix = ensurePodNamePrefixLength(prefix)
 
-	prefix := fmt.Sprintf("%s-%s", workflowName, templateName)
-	prefix = ensurePodNamePrefixLength(prefix)
+		h := fnv.New32a()
+		_, _ = h.Write([]byte(nodeName))
+		return fmt.Sprintf("%s-%v", prefix, h.Sum32())
+	}
 
-	h := fnv.New32a()
-	_, _ = h.Write([]byte(nodeName))
-	return fmt.Sprintf("%s-%v", prefix, h.Sum32())
+	return nodeID
 }
 
 func ensurePodNamePrefixLength(prefix string) string {

diff --git a/workflow/util/pod_name_test.go b/workflow/util/pod_name_test.go
@@ -20,7 +20,7 @@ func TestPodName(t *testing.T) {
 	assert.Equal(t, expected, actual)
 
 	name := PodName(shortWfName, nodeName, shortTemplateName, nodeID)
-	assert.Equal(t, "wfname-templatename-1454367246", name)
+	assert.Equal(t, nodeID, name)
 
 	// long case
 	longWfName := "alongworkflownamethatincludeslotsofdetailsandisessentiallyalargerunonsentencewithpoorstyleandnopunctuationtobehadwhatsoever"
@@ -35,5 +35,5 @@ func TestPodName(t *testing.T) {
 	assert.Equal(t, maxK8sResourceNameLength-k8sNamingHashLength-1, len(actual))
 
 	name = PodName(longWfName, nodeName, longTemplateName, nodeID)
-	assert.Equal(t, maxK8sResourceNameLength, len(name))
+	assert.Equal(t, nodeID, name)
 }