Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed service name generation for function name < 17 chars (#2142)

Browse Source 
Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2021-08-03 14:19:04 +05:30
committed by GitHub
parent 8271dfae07
commit 672bdbba6f
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/executor/executortype/container/containermgr.go
+10 -1
View File
@@ -676,7 +676,16 @@ func (caaf *Container) getObjName(fn *fv1.Function) string {
if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 { if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 {
functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace
} else { } 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 // 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 // functionMetadata should be 35 characters long, as we take 17 characters from functionUid
pkg/executor/executortype/newdeploy/newdeploymgr.go
+10 -1
View File
@@ -724,7 +724,16 @@ func (deploy *NewDeploy) getObjName(fn *fv1.Function) string {
if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 { if len(fn.ObjectMeta.Name)+len(fn.ObjectMeta.Namespace) < 35 {
functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace functionMetadata = fn.ObjectMeta.Name + "-" + fn.ObjectMeta.Namespace
} else { } 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 // 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 // functionMetadata should be 35 characters long, as we take 17 characters from functionUid