fix: Resolve the conflicts

5GSEC · Dec 15, 2023 · 89aeb56 · 89aeb56
2 parents 7feb25e + 1363558
commit 89aeb56
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 457 deletions.
diff --git a/.github/workflows/latest-release.yaml b/.github/workflows/latest-release.yaml
@@ -16,6 +16,7 @@ permissions: read-all
 
 jobs:
   release-nimbus-image:
+    if: github.repository == '5GSEC/nimbus'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code

diff --git a/Nimbus/cmd/main.go b/Nimbus/cmd/main.go
@@ -32,8 +32,7 @@ import (
 
 	// Importing third-party Kubernetes resource types
 	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
-	kubearmorhostpolicyv1 "github.com/kubearmor/KubeArmor/pkg/KubeArmorHostPolicy/api/security.kubearmor.com/v1"
-	kubearmorpolicyv1 "github.com/kubearmor/KubeArmor/pkg/KubeArmorPolicy/api/security.kubearmor.com/v1"
+	kubearmorv1 "github.com/kubearmor/KubeArmor/pkg/KubeArmorController/api/security.kubearmor.com/v1"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -46,9 +45,9 @@ var (
 func init() {
 	// In init, various Kubernetes and custom resources are added to the scheme.
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+
 	utilruntime.Must(intentv1.AddToScheme(scheme))
-	utilruntime.Must(kubearmorpolicyv1.AddToScheme(scheme))
-	utilruntime.Must(kubearmorhostpolicyv1.AddToScheme(scheme))
+	utilruntime.Must(kubearmorv1.AddToScheme(scheme))
 	utilruntime.Must(ciliumv2.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }

diff --git a/Nimbus/config/crd/bases/intent.security.nimbus.com_securityintentbindings.yaml b/Nimbus/config/crd/bases/intent.security.nimbus.com_securityintentbindings.yaml
diff --git a/Nimbus/config/crd/bases/intent.security.nimbus.com_securityintents.yaml b/Nimbus/config/crd/bases/intent.security.nimbus.com_securityintents.yaml
diff --git a/Nimbus/controllers/cleanup/cleanup.go b/Nimbus/controllers/cleanup/cleanup.go
@@ -40,7 +40,7 @@ func Cleanup(ctx context.Context, k8sClient client.Client, logger logr.Logger) e
 		bindingInfo := &general.BindingInfo{
 			Binding: &bindingCopy,
 		}
-	
+
 		// Deleting network policies associated with the current SecurityIntent.
 		if err := npc.DeletePolicy(ctx, bindingInfo); err != nil {
 			logger.Error(err, "Failed to delete network policy for SecurityIntentBinding", "Name", bindingCopy.Name)

diff --git a/Nimbus/controllers/policy/network_policy.go b/Nimbus/controllers/policy/network_policy.go
@@ -60,4 +60,4 @@ func (npc *NetworkPolicyController) DeletePolicy(ctx context.Context, bindingInf
 
 	log.Info("Deleted Network Policy", "PolicyName", bindingInfo.Binding.Name)
 	return nil
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     	log.Info("Deleted Network Policy", "PolicyName", bindingInfo.Binding.Name)
     	return nil
-    }
+    }