Merge pull request #160 from d-uzlov/qfix-create-pod-name-generation

[qfix] Fix createpod name generation
networkservicemesh · May 24, 2021 · d7a1a2c · d7a1a2c
2 parents c9fe0b0 + 361d267
commit d7a1a2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/networkservice/common/createpod/option.go b/pkg/networkservice/common/createpod/option.go
@@ -37,7 +37,7 @@ func WithLabelsKey(labelsKey string) Option {
 }
 
 // WithNameGenerator sets function to be used for pod name generation.
-// Default behavior is to append "-nodeName=<nodeName>" to the template name.
+// Default behavior is to append "--on-node--<nodeName>" to the template name.
 func WithNameGenerator(nameGenerator func(templateName, nodeName string) string) Option {
 	return func(t *createPodServer) {
 		t.nameGenerator = nameGenerator

diff --git a/pkg/networkservice/common/createpod/server.go b/pkg/networkservice/common/createpod/server.go
@@ -52,7 +52,7 @@ func NewServer(client kubernetes.Interface, podTemplate *corev1.Pod, options ...
 		namespace:   "default",
 		labelsKey:   "NSM_LABELS",
 		nameGenerator: func(templateName, nodeName string) string {
-			return templateName + "-nodeName=" + nodeName
+			return templateName + "--on-node--" + nodeName
 		},
 	}
 

diff --git a/pkg/networkservice/common/createpod/server_test.go b/pkg/networkservice/common/createpod/server_test.go
@@ -68,7 +68,7 @@ func TestCreatePod_RepeatedRequest(t *testing.T) {
 		Connection: &networkservice.Connection{},
 	})
 	require.Error(t, err)
-	require.Equal(t, "pods \""+podTemplate.ObjectMeta.Name+"-nodeName="+nodeName1+"\" already exists", err.Error())
+	require.Equal(t, "pods \""+podTemplate.ObjectMeta.Name+"--on-node--"+nodeName1+"\" already exists", err.Error())
 
 	podList, err := clientSet.CoreV1().Pods(testNamespace).List(ctx, metav1.ListOptions{})
 	require.NoError(t, err)