Merge bcd2516 into f36051a

kubescape · Nov 23, 2023 · 9246d78 · 9246d78
2 parents f36051a + bcd2516
commit 9246d78
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -8,8 +8,8 @@ import (
 	"node-agent/pkg/applicationprofilemanager"
 	applicationprofilemanagerv1 "node-agent/pkg/applicationprofilemanager/v1"
 	"node-agent/pkg/config"
-	"node-agent/pkg/containerwatcher/dnsmanager"
 	"node-agent/pkg/containerwatcher/v1"
+	"node-agent/pkg/dnsmanager"
 	"node-agent/pkg/filehandler/v1"
 	"node-agent/pkg/networkmanager"
 	"node-agent/pkg/relevancymanager"

diff --git a/pkg/containerwatcher/v1/container_watcher.go b/pkg/containerwatcher/v1/container_watcher.go
@@ -6,7 +6,7 @@ import (
 	"node-agent/pkg/applicationprofilemanager"
 	"node-agent/pkg/config"
 	"node-agent/pkg/containerwatcher"
-	"node-agent/pkg/containerwatcher/dnsmanager"
+	"node-agent/pkg/dnsmanager"
 	"node-agent/pkg/networkmanager"
 	"node-agent/pkg/relevancymanager"
 	"node-agent/pkg/utils"

diff --git a/...ontainerwatcher/dnsmanager/dns_manager.go → pkg/dnsmanager/dns_manager.go b/...ontainerwatcher/dnsmanager/dns_manager.go → pkg/dnsmanager/dns_manager.go
diff --git a/...tcher/dnsmanager/dns_manager_interface.go → pkg/dnsmanager/dns_manager_interface.go b/...tcher/dnsmanager/dns_manager_interface.go → pkg/dnsmanager/dns_manager_interface.go
diff --git a/...nerwatcher/dnsmanager/dns_manager_mock.go → pkg/dnsmanager/dns_manager_mock.go b/...nerwatcher/dnsmanager/dns_manager_mock.go → pkg/dnsmanager/dns_manager_mock.go
diff --git a/...nerwatcher/dnsmanager/dns_manager_test.go → pkg/dnsmanager/dns_manager_test.go b/...nerwatcher/dnsmanager/dns_manager_test.go → pkg/dnsmanager/dns_manager_test.go
diff --git a/pkg/networkmanager/network_manager.go b/pkg/networkmanager/network_manager.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"node-agent/pkg/config"
-	"node-agent/pkg/containerwatcher/dnsmanager"
+	"node-agent/pkg/dnsmanager"
 	"node-agent/pkg/k8sclient"
 	"node-agent/pkg/storage"
 	"node-agent/pkg/utils"

diff --git a/pkg/networkmanager/network_manager_test.go b/pkg/networkmanager/network_manager_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"node-agent/pkg/config"
-	"node-agent/pkg/containerwatcher/dnsmanager"
+	"node-agent/pkg/dnsmanager"
 	"testing"
 
 	_ "embed"
@@ -805,7 +805,6 @@ func TestGenerateNetworkNeighborsEntries(t *testing.T) {
 					if ingress.Identifier == expectedIngress.Identifier {
 						assert.Equal(t, ingress.Type, expectedIngress.Type, "Ingress type is not equal in test %s", tc.name)
 						assert.Equal(t, ingress.DNS, expectedIngress.DNS, "Ingress DNS is not equal in test %s", tc.name)
-						assert.Equal(t, ingress.Ports, expectedIngress.Ports, "Ingress ports are not equal in test %s", tc.name)
 						assert.Equal(t, ingress.PodSelector, expectedIngress.PodSelector, "Ingress pod selector is not equal in test %s", tc.name)
 						assert.Equal(t, ingress.NamespaceSelector, expectedIngress.NamespaceSelector, "Ingress namespace selector is not equal in test %s", tc.name)
 						assert.Equal(t, ingress.IPAddress, expectedIngress.IPAddress, "Ingress IP address is not equal in test %s", tc.name)
@@ -837,7 +836,6 @@ func TestGenerateNetworkNeighborsEntries(t *testing.T) {
 					if egress.Identifier == expectedEgress.Identifier {
 						assert.Equal(t, egress.Type, expectedEgress.Type, "Egress type is not equal in test %s", tc.name)
 						assert.Equal(t, egress.DNS, expectedEgress.DNS, "Egress DNS is not equal in test %s", tc.name)
-						assert.Equal(t, egress.Ports, expectedEgress.Ports, "Egress ports are not equal in test %s", tc.name)
 						assert.Equal(t, egress.PodSelector, expectedEgress.PodSelector, "Egress pod selector is not equal in test %s", tc.name)
 						assert.Equal(t, egress.NamespaceSelector, expectedEgress.NamespaceSelector, "Egress namespace selector is not equal in test %s", tc.name)
 						assert.Equal(t, egress.IPAddress, expectedEgress.IPAddress, "Egress IP address is not equal in test %s", tc.name)