From 672bdbba6f6a76d0900fd286d49388c55ebec14e Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Tue, 3 Aug 2021 14:19:04 +0530 Subject: [PATCH] Fixed service name generation for function name < 17 chars (#2142) Signed-off-by: Sanket Sudake --- pkg/executor/executortype/container/containermgr.go | 11 ++++++++++- pkg/executor/executortype/newdeploy/newdeploymgr.go | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkg/executor/executortype/container/containermgr.go b/pkg/executor/executortype/container/containermgr.go index 1c896894..21e92562 100644 --- a/pkg/executor/executortype/container/containermgr.go +++ b/pkg/executor/executortype/container/containermgr.go @@ -676,7 +676,16 @@ func (caaf *Container) getObjName(fn *fv1.Function) string { if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 { functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace } else { - functionMetadata = fn.ObjectMeta.Name[:17] + "-" + fn.ObjectMeta.Namespace[:17] + if len(fn.ObjectMeta.Name) > 17 { + functionMetadata = fn.ObjectMeta.Name[:17] + } else { + functionMetadata = fn.ObjectMeta.Name + } + if len(fn.ObjectMeta.Namespace) > 17 { + functionMetadata = functionMetadata + "-" + fn.ObjectMeta.Namespace[:17] + } else { + functionMetadata = functionMetadata + "-" + fn.ObjectMeta.Namespace + } } // contructed name should be 63 characters long, as it is a valid k8s name // functionMetadata should be 35 characters long, as we take 17 characters from functionUid diff --git a/pkg/executor/executortype/newdeploy/newdeploymgr.go b/pkg/executor/executortype/newdeploy/newdeploymgr.go index ca3d27a2..61179642 100644 --- a/pkg/executor/executortype/newdeploy/newdeploymgr.go +++ b/pkg/executor/executortype/newdeploy/newdeploymgr.go @@ -724,7 +724,16 @@ func (deploy *NewDeploy) getObjName(fn *fv1.Function) string { if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 { functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace } else { - functionMetadata = fn.ObjectMeta.Name[:17] + "-" + fn.ObjectMeta.Namespace[:17] + if len(fn.ObjectMeta.Name) > 17 { + functionMetadata = fn.ObjectMeta.Name[:17] + } else { + functionMetadata = fn.ObjectMeta.Name + } + if len(fn.ObjectMeta.Namespace) > 17 { + functionMetadata = functionMetadata + "-" + fn.ObjectMeta.Namespace[:17] + } else { + functionMetadata = functionMetadata + "-" + fn.ObjectMeta.Namespace + } } // contructed name should be 63 characters long, as it is a valid k8s name // functionMetadata should be 35 characters long, as we take 17 characters from functionUid