Merge pull request #27 from anurag-rajawat/fix-ci

fix(ci): Restructured directories to resolve CI failures
5GSEC · Jan 4, 2024 · cf09d53 · cf09d53
2 parents cc1f20f + a601625
commit cf09d53
Show file tree

Hide file tree

Showing 72 changed files with 31 additions and 31 deletions.
diff --git a/nimbus-operator/.dockerignore → .dockerignore b/nimbus-operator/.dockerignore → .dockerignore
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin/*
+bin
 Dockerfile.cross
 
 # Test binary, build with `go test -c`

diff --git a/nimbus-operator/Dockerfile → Dockerfile b/nimbus-operator/Dockerfile → Dockerfile
@@ -16,8 +16,8 @@ RUN go mod download
 
 # Copy the go source
 COPY cmd/main.go cmd/main.go
-COPY pkg/api/ pkg/api/
-COPY pkg/controllers/ pkg/controllers/
+COPY api/ api/
+COPY pkg/ pkg/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

diff --git a/nimbus-operator/Makefile → Makefile b/nimbus-operator/Makefile → Makefile
diff --git a/nimbus-operator/PROJECT → PROJECT b/nimbus-operator/PROJECT → PROJECT
diff --git a/...-operator/pkg/api/v1/groupversion_info.go → api/v1/groupversion_info.go b/...-operator/pkg/api/v1/groupversion_info.go → api/v1/groupversion_info.go
diff --git a/...operator/pkg/api/v1/nimbuspolicy_types.go → api/v1/nimbuspolicy_types.go b/...operator/pkg/api/v1/nimbuspolicy_types.go → api/v1/nimbuspolicy_types.go
diff --git a/...erator/pkg/api/v1/securityintent_types.go → api/v1/securityintent_types.go b/...erator/pkg/api/v1/securityintent_types.go → api/v1/securityintent_types.go
diff --git a/...pkg/api/v1/securityintentbinding_types.go → api/v1/securityintentbinding_types.go b/...pkg/api/v1/securityintentbinding_types.go → api/v1/securityintentbinding_types.go
diff --git a/...rator/pkg/api/v1/zz_generated.deepcopy.go → api/v1/zz_generated.deepcopy.go b/...rator/pkg/api/v1/zz_generated.deepcopy.go → api/v1/zz_generated.deepcopy.go
diff --git a/nimbus-operator/cmd/main.go → cmd/main.go b/nimbus-operator/cmd/main.go → cmd/main.go
@@ -20,11 +20,11 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	// Importing custom API types and controllers
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	nimbuspolicy "github.com/5GSEC/nimbus/nimbus-operator/pkg/exporter/nimbuspolicy"
-	securityintent "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/securityintent"
-	securityintentbinding "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/securityintentbinding"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/exporter/nimbuspolicy"
+	"github.com/5GSEC/nimbus/pkg/receiver/securityintent"
+	"github.com/5GSEC/nimbus/pkg/receiver/securityintentbinding"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 
 	// Importing third-party Kubernetes resource types
 	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"

diff --git a/...t.security.nimbus.com_nimbuspolicies.yaml → ...t.security.nimbus.com_nimbuspolicies.yaml b/...t.security.nimbus.com_nimbuspolicies.yaml → ...t.security.nimbus.com_nimbuspolicies.yaml
diff --git a/...ty.nimbus.com_securityintentbindings.yaml → ...ty.nimbus.com_securityintentbindings.yaml b/...ty.nimbus.com_securityintentbindings.yaml → ...ty.nimbus.com_securityintentbindings.yaml
diff --git a/....security.nimbus.com_securityintents.yaml → ....security.nimbus.com_securityintents.yaml b/....security.nimbus.com_securityintents.yaml → ....security.nimbus.com_securityintents.yaml
diff --git a/...us-operator/config/crd/kustomization.yaml → config/crd/kustomization.yaml b/...us-operator/config/crd/kustomization.yaml → config/crd/kustomization.yaml
diff --git a/...-operator/config/crd/kustomizeconfig.yaml → config/crd/kustomizeconfig.yaml b/...-operator/config/crd/kustomizeconfig.yaml → config/crd/kustomizeconfig.yaml
diff --git a/...perator/config/default/kustomization.yaml → config/default/kustomization.yaml b/...perator/config/default/kustomization.yaml → config/default/kustomization.yaml
diff --git a/...fig/default/manager_auth_proxy_patch.yaml → config/default/manager_auth_proxy_patch.yaml b/...fig/default/manager_auth_proxy_patch.yaml → config/default/manager_auth_proxy_patch.yaml
diff --git a/.../config/default/manager_config_patch.yaml → config/default/manager_config_patch.yaml b/.../config/default/manager_config_patch.yaml → config/default/manager_config_patch.yaml
diff --git a/...perator/config/manager/kustomization.yaml → config/manager/kustomization.yaml b/...perator/config/manager/kustomization.yaml → config/manager/kustomization.yaml
diff --git a/nimbus-operator/config/manager/manager.yaml → config/manager/manager.yaml b/nimbus-operator/config/manager/manager.yaml → config/manager/manager.yaml
diff --git a/...ator/config/prometheus/kustomization.yaml → config/prometheus/kustomization.yaml b/...ator/config/prometheus/kustomization.yaml → config/prometheus/kustomization.yaml
diff --git a/...s-operator/config/prometheus/monitor.yaml → config/prometheus/monitor.yaml b/...s-operator/config/prometheus/monitor.yaml → config/prometheus/monitor.yaml
diff --git a/...g/rbac/auth_proxy_client_clusterrole.yaml → ...g/rbac/auth_proxy_client_clusterrole.yaml b/...g/rbac/auth_proxy_client_clusterrole.yaml → ...g/rbac/auth_proxy_client_clusterrole.yaml
diff --git a/...operator/config/rbac/auth_proxy_role.yaml → config/rbac/auth_proxy_role.yaml b/...operator/config/rbac/auth_proxy_role.yaml → config/rbac/auth_proxy_role.yaml
diff --git a/.../config/rbac/auth_proxy_role_binding.yaml → config/rbac/auth_proxy_role_binding.yaml b/.../config/rbac/auth_proxy_role_binding.yaml → config/rbac/auth_proxy_role_binding.yaml
diff --git a/...rator/config/rbac/auth_proxy_service.yaml → config/rbac/auth_proxy_service.yaml b/...rator/config/rbac/auth_proxy_service.yaml → config/rbac/auth_proxy_service.yaml
diff --git a/...s-operator/config/rbac/kustomization.yaml → config/rbac/kustomization.yaml b/...s-operator/config/rbac/kustomization.yaml → config/rbac/kustomization.yaml
diff --git a/...tor/config/rbac/leader_election_role.yaml → config/rbac/leader_election_role.yaml b/...tor/config/rbac/leader_election_role.yaml → config/rbac/leader_election_role.yaml
diff --git a/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml b/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml
diff --git a/...config/rbac/nimbuspolicy_editor_role.yaml → config/rbac/nimbuspolicy_editor_role.yaml b/...config/rbac/nimbuspolicy_editor_role.yaml → config/rbac/nimbuspolicy_editor_role.yaml
diff --git a/...config/rbac/nimbuspolicy_viewer_role.yaml → config/rbac/nimbuspolicy_viewer_role.yaml b/...config/rbac/nimbuspolicy_viewer_role.yaml → config/rbac/nimbuspolicy_viewer_role.yaml
diff --git a/nimbus-operator/config/rbac/role.yaml → config/rbac/role.yaml b/nimbus-operator/config/rbac/role.yaml → config/rbac/role.yaml
diff --git a/...us-operator/config/rbac/role_binding.yaml → config/rbac/role_binding.yaml b/...us-operator/config/rbac/role_binding.yaml → config/rbac/role_binding.yaml
diff --git a/...nfig/rbac/securityintent_editor_role.yaml → config/rbac/securityintent_editor_role.yaml b/...nfig/rbac/securityintent_editor_role.yaml → config/rbac/securityintent_editor_role.yaml
diff --git a/...nfig/rbac/securityintent_viewer_role.yaml → config/rbac/securityintent_viewer_role.yaml b/...nfig/rbac/securityintent_viewer_role.yaml → config/rbac/securityintent_viewer_role.yaml
diff --git a/...ac/securityintentbinding_editor_role.yaml → ...ac/securityintentbinding_editor_role.yaml b/...ac/securityintentbinding_editor_role.yaml → ...ac/securityintentbinding_editor_role.yaml
diff --git a/...ac/securityintentbinding_viewer_role.yaml → ...ac/securityintentbinding_viewer_role.yaml b/...ac/securityintentbinding_viewer_role.yaml → ...ac/securityintentbinding_viewer_role.yaml
diff --git a/...operator/config/rbac/service_account.yaml → config/rbac/service_account.yaml b/...operator/config/rbac/service_account.yaml → config/rbac/service_account.yaml
diff --git a/...onfig/samples/intent_v1_nimbuspolicy.yaml → config/samples/intent_v1_nimbuspolicy.yaml b/...onfig/samples/intent_v1_nimbuspolicy.yaml → config/samples/intent_v1_nimbuspolicy.yaml
diff --git a/...fig/samples/intent_v1_securityintent.yaml → config/samples/intent_v1_securityintent.yaml b/...fig/samples/intent_v1_securityintent.yaml → config/samples/intent_v1_securityintent.yaml
diff --git a/...ples/intent_v1_securityintentbinding.yaml → ...ples/intent_v1_securityintentbinding.yaml b/...ples/intent_v1_securityintentbinding.yaml → ...ples/intent_v1_securityintentbinding.yaml
diff --git a/...perator/config/samples/kustomization.yaml → config/samples/kustomization.yaml b/...perator/config/samples/kustomization.yaml → config/samples/kustomization.yaml
diff --git a/nimbus-operator/go.mod → go.mod b/nimbus-operator/go.mod → go.mod
@@ -1,4 +1,4 @@
-module github.com/5GSEC/nimbus/nimbus-operator
+module github.com/5GSEC/nimbus
 
 go 1.20
 

diff --git a/nimbus-operator/go.sum → go.sum b/nimbus-operator/go.sum → go.sum
diff --git a/nimbus-operator/hack/boilerplate.go.txt → hack/boilerplate.go.txt b/nimbus-operator/hack/boilerplate.go.txt → hack/boilerplate.go.txt
diff --git a/nimbus-operator/bin/controller-gen b/nimbus-operator/bin/controller-gen
diff --git a/nimbus-operator/bin/golangci-lint b/nimbus-operator/bin/golangci-lint
diff --git a/nimbus-operator/bin/k8s/1.28.0-linux-amd64/etcd b/nimbus-operator/bin/k8s/1.28.0-linux-amd64/etcd
diff --git a/nimbus-operator/bin/k8s/1.28.0-linux-amd64/kubectl b/nimbus-operator/bin/k8s/1.28.0-linux-amd64/kubectl
diff --git a/nimbus-operator/bin/kustomize b/nimbus-operator/bin/kustomize
diff --git a/nimbus-operator/bin/manager b/nimbus-operator/bin/manager
diff --git a/nimbus-operator/bin/setup-envtest b/nimbus-operator/bin/setup-envtest
diff --git a/nimbus-operator/cleanup/cleanup.go → pkg/cleanup/cleanup.go b/nimbus-operator/cleanup/cleanup.go → pkg/cleanup/cleanup.go
diff --git a/.../pkg/exporter/httpexporter/http_nimbus.go → pkg/exporter/httpexporter/http_nimbus.go b/.../pkg/exporter/httpexporter/http_nimbus.go → pkg/exporter/httpexporter/http_nimbus.go
@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"net/http"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 )
 
 // HttpNimbusExporter struct defines the HTTP client and the URL for exporting Nimbus policies.

diff --git a/...r/nimbuspolicy/nimbuspolicy_controller.go → ...r/nimbuspolicy/nimbuspolicy_controller.go b/...r/nimbuspolicy/nimbuspolicy_controller.go → ...r/nimbuspolicy/nimbuspolicy_controller.go
@@ -12,9 +12,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/exporter/httpexporter"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/exporter/httpexporter"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 // NimbusPolicyReconciler reconciles a NimbusPolicy object.

diff --git a/...r/pkg/exporter/nimbuspolicy/suite_test.go → pkg/exporter/nimbuspolicy/suite_test.go b/...r/pkg/exporter/nimbuspolicy/suite_test.go → pkg/exporter/nimbuspolicy/suite_test.go
@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/nimbus-kubearmor/processor/network_policy.go → ...bus-kubearmor/processor/network_policy.go b/nimbus-kubearmor/processor/network_policy.go → ...bus-kubearmor/processor/network_policy.go
diff --git a/...-kubearmor/processor/policy_controller.go → ...-kubearmor/processor/policy_controller.go b/...-kubearmor/processor/policy_controller.go → ...-kubearmor/processor/policy_controller.go
diff --git a/nimbus-kubearmor/processor/system_policy.go → ...mbus-kubearmor/processor/system_policy.go b/nimbus-kubearmor/processor/system_policy.go → ...mbus-kubearmor/processor/system_policy.go
diff --git a/...kubearmor/processor/utils/utils_policy.go → ...kubearmor/processor/utils/utils_policy.go b/...kubearmor/processor/utils/utils_policy.go → ...kubearmor/processor/utils/utils_policy.go
diff --git a/nimbus-kubearmor/receiver/server/server.go → ...imbus-kubearmor/receiver/server/server.go b/nimbus-kubearmor/receiver/server/server.go → ...imbus-kubearmor/receiver/server/server.go
@@ -6,7 +6,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"sync"
@@ -28,7 +28,7 @@ func main() {
 		}
 
 		// Read the request body
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			http.Error(w, "Error reading request body", http.StatusInternalServerError)
 			return

diff --git a/...g/processor/intentbinder/intent_binder.go → pkg/processor/intentbinder/intent_binder.go b/...g/processor/intentbinder/intent_binder.go → pkg/processor/intentbinder/intent_binder.go
@@ -6,7 +6,7 @@ package intentbinder
 import (
 	"context"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/...mbuspolicybuilder/nimbuspolicy_builder.go → ...mbuspolicybuilder/nimbuspolicy_builder.go b/...mbuspolicybuilder/nimbuspolicy_builder.go → ...mbuspolicybuilder/nimbuspolicy_builder.go
@@ -11,8 +11,8 @@ import (
 	"github.com/google/cel-go/checker/decls"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	intentbinder "github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/intentbinder"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/processor/intentbinder"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/...curityintent/securityintent_controller.go → ...curityintent/securityintent_controller.go b/...curityintent/securityintent_controller.go → ...curityintent/securityintent_controller.go
@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 type SecurityIntentReconciler struct {

diff --git a/...pkg/receiver/securityintent/suite_test.go → pkg/receiver/securityintent/suite_test.go b/...pkg/receiver/securityintent/suite_test.go → pkg/receiver/securityintent/suite_test.go
@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/...nding/securityintentbinding_controller.go → ...nding/securityintentbinding_controller.go b/...nding/securityintentbinding_controller.go → ...nding/securityintentbinding_controller.go
@@ -12,10 +12,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/intentbinder"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/nimbuspolicybuilder"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/processor/intentbinder"
+	"github.com/5GSEC/nimbus/pkg/processor/nimbuspolicybuilder"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 // SecurityIntentBindingReconciler reconciles a SecurityIntentBinding object

diff --git a/...eiver/securityintentbinding/suite_test.go → ...eiver/securityintentbinding/suite_test.go b/...eiver/securityintentbinding/suite_test.go → ...eiver/securityintentbinding/suite_test.go
@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/...tor/pkg/receiver/watcher/watch_binding.go → pkg/receiver/watcher/watch_binding.go b/...tor/pkg/receiver/watcher/watch_binding.go → pkg/receiver/watcher/watch_binding.go
@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/.../pkg/receiver/watcher/watch_controller.go → pkg/receiver/watcher/watch_controller.go b/.../pkg/receiver/watcher/watch_controller.go → pkg/receiver/watcher/watch_controller.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/...ator/pkg/receiver/watcher/watch_intent.go → pkg/receiver/watcher/watch_intent.go b/...ator/pkg/receiver/watcher/watch_intent.go → pkg/receiver/watcher/watch_intent.go
@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/...kg/receiver/watcher/watch_nimbuspolicy.go → pkg/receiver/watcher/watch_nimbuspolicy.go b/...kg/receiver/watcher/watch_nimbuspolicy.go → pkg/receiver/watcher/watch_nimbuspolicy.go
@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     *.dll
     *.so
     *.dylib
-    bin/*
+    bin
     Dockerfile.cross
     # Test binary, build with `go test -c`
@@ Expand Down @@