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

style: typo for the BuilderNamespace (#2776)

Browse Source 
Signed-off-by: saltbo <saltbo@foxmail.com>
This commit is contained in:
Ambor
2023-04-11 08:39:42 +05:30
committed by GitHub
parent 3a1db58066
commit 117c383fac
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/executor/executortype/newdeploy/newdeploymgr_test.go
+1 -1
View File
@@ -66,7 +66,7 @@ func TestRefreshFuncPods(t *testing.T) {
nsResolver := utils.NamespaceResolver{ nsResolver := utils.NamespaceResolver{
FunctionNamespace: functionNamespace, FunctionNamespace: functionNamespace,
BuiderNamespace: builderNamespace, BuilderNamespace: builderNamespace,
DefaultNamespace: defaultNamespace, DefaultNamespace: defaultNamespace,
} }
ndm.nsResolver = &nsResolver ndm.nsResolver = &nsResolver
pkg/utils/namespace.go
+9 -9
View File
@@ -20,7 +20,7 @@ const (
type ( type (
NamespaceResolver struct { NamespaceResolver struct {
FunctionNamespace string FunctionNamespace string
BuiderNamespace string BuilderNamespace string
DefaultNamespace string DefaultNamespace string
FissionResourceNS map[string]string FissionResourceNS map[string]string
Logger *zap.Logger Logger *zap.Logger
@@ -40,14 +40,14 @@ var nsResolver *NamespaceResolver
func init() { func init() {
nsResolver = &NamespaceResolver{ nsResolver = &NamespaceResolver{
FunctionNamespace: os.Getenv(ENV_FUNCTION_NAMESPACE), FunctionNamespace: os.Getenv(ENV_FUNCTION_NAMESPACE),
BuiderNamespace: os.Getenv(ENV_BUILDER_NAMESPACE), BuilderNamespace: os.Getenv(ENV_BUILDER_NAMESPACE),
DefaultNamespace: os.Getenv(ENV_DEFAULT_NAMESPACE), DefaultNamespace: os.Getenv(ENV_DEFAULT_NAMESPACE),
FissionResourceNS: GetNamespaces(), FissionResourceNS: GetNamespaces(),
Logger: loggerfactory.GetLogger(), Logger: loggerfactory.GetLogger(),
} }
nsResolver.Logger.Debug("namespaces", zap.String("function_namespace", nsResolver.FunctionNamespace), nsResolver.Logger.Debug("namespaces", zap.String("function_namespace", nsResolver.FunctionNamespace),
zap.String("builder_namespace", nsResolver.BuiderNamespace), zap.String("builder_namespace", nsResolver.BuilderNamespace),
zap.String("default_namespace", nsResolver.DefaultNamespace), zap.String("default_namespace", nsResolver.DefaultNamespace),
zap.Any("fission_resource_namespace", listNamespaces(nsResolver.FissionResourceNS))) zap.Any("fission_resource_namespace", listNamespaces(nsResolver.FissionResourceNS)))
} }
@@ -96,8 +96,8 @@ func (nsr *NamespaceResolver) FissionNSWithOptions(option ...option) map[string]
if options.functionNS && nsr.FunctionNamespace != "" { if options.functionNS && nsr.FunctionNamespace != "" {
fissionResourceNS[nsr.FunctionNamespace] = nsr.FunctionNamespace fissionResourceNS[nsr.FunctionNamespace] = nsr.FunctionNamespace
} }
if options.builderNS && nsr.BuiderNamespace != "" { if options.builderNS && nsr.BuilderNamespace != "" {
fissionResourceNS[nsr.BuiderNamespace] = nsr.BuiderNamespace fissionResourceNS[nsr.BuilderNamespace] = nsr.BuilderNamespace
} }
if options.defaultNs && nsr.DefaultNamespace != "" { if options.defaultNs && nsr.DefaultNamespace != "" {
fissionResourceNS[nsr.DefaultNamespace] = nsr.DefaultNamespace fissionResourceNS[nsr.DefaultNamespace] = nsr.DefaultNamespace
@@ -118,7 +118,7 @@ func GetNamespaces() map[string]string {
if len(envValue) > 0 { if len(envValue) > 0 {
lstNamespaces := strings.Split(envValue, ",") lstNamespaces := strings.Split(envValue, ",")
for _, namespace := range lstNamespaces { for _, namespace := range lstNamespaces {
//check to handle string with additional comma at the end of string. eg- ns1,ns2, // check to handle string with additional comma at the end of string. eg- ns1,ns2,
if namespace != "" { if namespace != "" {
namespaces[namespace] = namespace namespaces[namespace] = namespace
} }
@@ -132,14 +132,14 @@ func GetNamespaces() map[string]string {
} }
func (nsr *NamespaceResolver) GetBuilderNS(namespace string) string { func (nsr *NamespaceResolver) GetBuilderNS(namespace string) string {
if nsr.BuiderNamespace == "" { if nsr.BuilderNamespace == "" {
return namespace return namespace
} }
if namespace != metav1.NamespaceDefault { if namespace != metav1.NamespaceDefault {
return namespace return namespace
} }
return nsr.BuiderNamespace return nsr.BuilderNamespace
} }
func (nsr *NamespaceResolver) GetFunctionNS(namespace string) string { func (nsr *NamespaceResolver) GetFunctionNS(namespace string) string {
@@ -154,7 +154,7 @@ func (nsr *NamespaceResolver) GetFunctionNS(namespace string) string {
} }
func (nsr *NamespaceResolver) ResolveNamespace(namespace string) string { func (nsr *NamespaceResolver) ResolveNamespace(namespace string) string {
if nsr.FunctionNamespace == "" || nsr.BuiderNamespace == "" { if nsr.FunctionNamespace == "" || nsr.BuilderNamespace == "" {
return nsr.DefaultNamespace return nsr.DefaultNamespace
} }
return namespace return namespace
pkg/utils/namespace_test.go
+1 -1
View File
@@ -226,7 +226,7 @@ func TestNamespaceResolver(t *testing.T) {
func getFissionNamespaces(builderNS, functionNS, defaultNS string) *NamespaceResolver { func getFissionNamespaces(builderNS, functionNS, defaultNS string) *NamespaceResolver {
return &NamespaceResolver{ return &NamespaceResolver{
FunctionNamespace: functionNS, FunctionNamespace: functionNS,
BuiderNamespace: builderNS, BuilderNamespace: builderNS,
DefaultNamespace: defaultNS, DefaultNamespace: defaultNS,
} }
} }