Update policy_yaml cluster_name from config (accuknox#636)

Signed-off-by: Eswar Rajan Subramanian <eswar@accuknox.com>
Prateeknandle · Jan 12, 2023 · 05fe3a9 · 05fe3a9
1 parent 8237f48
commit 05fe3a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/networkpolicy/networkPolicy.go b/src/networkpolicy/networkPolicy.go
@@ -2223,17 +2223,12 @@ func PopulateNetworkPoliciesFromNetworkLogs(networkLogs []types.KnoxNetworkLog)
 }
 
 func writeNetworkPoliciesYamlToDB(policies []types.KnoxNetworkPolicy) {
-	clusters := []string{}
 	res := []types.PolicyYaml{}
 
-	for _, pol := range policies {
-		clusters = append(clusters, pol.Metadata["cluster_name"])
-	}
-
 	if cfg.CurrentCfg.ConfigNetPolicy.NetworkLogFrom == "kubearmor" {
 		k8sNetPolicies := plugin.ConvertKnoxNetPolicyToK8sNetworkPolicy("", "", policies)
 
-		for i, np := range k8sNetPolicies {
+		for _, np := range k8sNetPolicies {
 			np.ClusterName = ""
 			jsonBytes, err := json.Marshal(np)
 			if err != nil {
@@ -2253,7 +2248,7 @@ func writeNetworkPoliciesYamlToDB(policies []types.KnoxNetworkPolicy) {
 				Namespace:   np.Namespace,
 				WorkspaceId: cfg.GetCfgWorkspaceId(),
 				ClusterId:   cfg.GetCfgClusterId(),
-				Cluster:     clusters[i],
+				Cluster:     cfg.GetCfgClusterName(),
 				Labels:      np.Labels,
 				Yaml:        yamlBytes,
 			}
@@ -2267,7 +2262,7 @@ func writeNetworkPoliciesYamlToDB(policies []types.KnoxNetworkPolicy) {
 		// convert knoxPolicy to CiliumPolicy
 		ciliumPolicies := plugin.ConvertKnoxPoliciesToCiliumPolicies(policies)
 
-		for i, ciliumPolicy := range ciliumPolicies {
+		for _, ciliumPolicy := range ciliumPolicies {
 			jsonBytes, err := json.Marshal(ciliumPolicy)
 			if err != nil {
 				log.Error().Msg(err.Error())
@@ -2291,7 +2286,7 @@ func writeNetworkPoliciesYamlToDB(policies []types.KnoxNetworkPolicy) {
 				Kind:        ciliumPolicy.Kind,
 				Name:        ciliumPolicy.Metadata["name"],
 				Namespace:   ciliumPolicy.Metadata["namespace"],
-				Cluster:     clusters[i],
+				Cluster:     cfg.GetCfgClusterName(),
 				WorkspaceId: cfg.GetCfgWorkspaceId(),
 				ClusterId:   cfg.GetCfgClusterId(),
 				Labels:      labels,

diff --git a/src/systempolicy/systemPolicy.go b/src/systempolicy/systemPolicy.go
@@ -1375,15 +1375,11 @@ func GenFileSetForAllPodsInCluster(clusterName string, pods []types.Pod, settype
 }
 
 func insertSysPoliciesYamlToDB(policies []types.KnoxSystemPolicy) {
-	clusters := []string{}
-	for _, policy := range policies {
-		clusters = append(clusters, policy.Metadata["cluster_name"])
-	}
 
 	kubeArmorPolicies := plugin.ConvertKnoxSystemPolicyToKubeArmorPolicy(policies)
 
 	res := []types.PolicyYaml{}
-	for i, kubearmorPolicy := range kubeArmorPolicies {
+	for _, kubearmorPolicy := range kubeArmorPolicies {
 		// dont save network policies to db
 		kubearmorPolicy.Spec.Network = types.NetworkRule{}
 		jsonBytes, err := json.Marshal(kubearmorPolicy)
@@ -1402,7 +1398,7 @@ func insertSysPoliciesYamlToDB(policies []types.KnoxSystemPolicy) {
 			Kind:        kubearmorPolicy.Kind,
 			Name:        kubearmorPolicy.Metadata["name"],
 			Namespace:   kubearmorPolicy.Metadata["namespace"],
-			Cluster:     clusters[i],
+			Cluster:     cfg.GetCfgClusterName(),
 			WorkspaceId: cfg.GetCfgWorkspaceId(),
 			ClusterId:   cfg.GetCfgClusterId(),
 			Labels:      kubearmorPolicy.Spec.Selector.MatchLabels,