Merge pull request karmada-io#4027 from XiShanYongYe-Chang/fix-depend…

…encies-lua-script-bug fix depndencies lua scrpit bug
weizj2000 · Sep 6, 2023 · 5a583c2 · 5a583c2
2 parents 7c96e0d + 734cf3a
commit 5a583c2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/charts/karmada/_crds/bases/config/config.karmada.io_resourceinterpretercustomizations.yaml b/charts/karmada/_crds/bases/config/config.karmada.io_resourceinterpretercustomizations.yaml
@@ -52,7 +52,7 @@ spec:
                           to interpret the dependencies of a specific resource. The
                           script should implement a function as follows: luaScript:
                           > function GetDependencies(desiredObj) dependencies = {}
-                          if desiredObj.spec.serviceAccountName ~= \"\" and desiredObj.spec.serviceAccountName
+                          if desiredObj.spec.serviceAccountName ~= nil and desiredObj.spec.serviceAccountName
                           ~= \"default\" then dependency = {} dependency.apiVersion
                           = \"v1\" dependency.kind = \"ServiceAccount\" dependency.name
                           = desiredObj.spec.serviceAccountName dependency.namespace

diff --git a/pkg/apis/config/v1alpha1/resourceinterpretercustomization_types.go b/pkg/apis/config/v1alpha1/resourceinterpretercustomization_types.go
@@ -275,7 +275,7 @@ type DependencyInterpretation struct {
 	//     luaScript: >
 	//         function GetDependencies(desiredObj)
 	//             dependencies = {}
-	//             if desiredObj.spec.serviceAccountName ~= "" and desiredObj.spec.serviceAccountName ~= "default" then
+	//             if desiredObj.spec.serviceAccountName ~= nil and desiredObj.spec.serviceAccountName ~= "default" then
 	//                 dependency = {}
 	//                 dependency.apiVersion = "v1"
 	//                 dependency.kind = "ServiceAccount"

diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
diff --git a/pkg/resourceinterpreter/customized/declarative/luavm/lua_test.go b/pkg/resourceinterpreter/customized/declarative/luavm/lua_test.go
@@ -543,7 +543,7 @@ func TestGetDeployPodDependencies(t *testing.T) {
 			luaScript: `function GetDependencies(desiredObj)
 							dependentSas = {}
 							refs = {}
-							if desiredObj.spec.template.spec.serviceAccountName ~= '' and desiredObj.spec.template.spec.serviceAccountName ~= 'default' then
+							if desiredObj.spec.template.spec.serviceAccountName ~= nil and desiredObj.spec.template.spec.serviceAccountName ~= 'default' then
 								dependentSas[desiredObj.spec.template.spec.serviceAccountName] = true
 							end
 						local idx = 1

diff --git a/pkg/util/interpreter/rule.go b/pkg/util/interpreter/rule.go
@@ -351,7 +351,7 @@ func (d *dependencyInterpretationRule) Document() string {
 The script should implement a function as follows:
 function GetDependencies(desiredObj)
   dependencies = {}
-  if desiredObj.spec.serviceAccountName ~= "" and desiredObj.spec.serviceAccountName ~= "default" then
+  if desiredObj.spec.serviceAccountName ~= nil and desiredObj.spec.serviceAccountName ~= "default" then
     dependency = {}
     dependency.apiVersion = "v1"
     dependency.kind = "ServiceAccount"

diff --git a/pkg/util/interpreter/rule_test.go b/pkg/util/interpreter/rule_test.go
@@ -571,7 +571,7 @@ func TestDependencyInterpretationRule_Document(t *testing.T) {
 The script should implement a function as follows:
 function GetDependencies(desiredObj)
   dependencies = {}
-  if desiredObj.spec.serviceAccountName ~= "" and desiredObj.spec.serviceAccountName ~= "default" then
+  if desiredObj.spec.serviceAccountName ~= nil and desiredObj.spec.serviceAccountName ~= "default" then
     dependency = {}
     dependency.apiVersion = "v1"
     dependency.kind = "ServiceAccount"

diff --git a/pkg/webhook/resourceinterpretercustomization/helper_test.go b/pkg/webhook/resourceinterpretercustomization/helper_test.go
@@ -376,7 +376,7 @@ end
 						DependencyInterpretation: &configv1alpha1.DependencyInterpretation{LuaScript: `
 function GetDependencies(desiredObj)                                                                     
     dependencies = {}                                                                                    
-    if desiredObj.spec.serviceAccountName ~= "" and desiredObj.spec.serviceAccountName ~= "default" then 
+    if desiredObj.spec.serviceAccountName ~= nil and desiredObj.spec.serviceAccountName ~= "default" then 
         dependency = {}                                                                                  
         dependency.apiVersion = "v1"                                                                     
         dependency.kind = "ServiceAccount"                                                               

diff --git a/test/e2e/resourceinterpreter_test.go b/test/e2e/resourceinterpreter_test.go
@@ -935,7 +935,7 @@ var _ = framework.SerialDescribe("Resource interpreter customization testing", f
 function GetDependencies(desiredObj)
 	dependentSas = {}
 	refs = {}
-	if desiredObj.spec.template.spec.serviceAccountName ~= '' and desiredObj.spec.template.spec.serviceAccountName ~= 'default' then
+	if desiredObj.spec.template.spec.serviceAccountName ~= nil and desiredObj.spec.template.spec.serviceAccountName ~= 'default' then
 		dependentSas[desiredObj.spec.template.spec.serviceAccountName] = true
 	end
 	local idx = 1