Skip to content

fix: remap Service egress ports to targetPort for NetworkPolicy generation (#943) #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ANAMASGARD wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remap Service egress ports to targetPort for NetworkPolicy generation (#943) #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions pkg/containerprofilemanager/v1/container_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
mapset "github.com/deckarep/golang-set/v2"
"github.com/kubescape/go-logger"
"github.com/kubescape/go-logger/helpers"
"github.com/kubescape/k8s-interface/k8sinterface"
"github.com/kubescape/node-agent/pkg/dnsmanager"
"github.com/kubescape/node-agent/pkg/k8sclient"
"github.com/kubescape/node-agent/pkg/utils"
"github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
)

// emptyEvents clears all event data
Expand Down Expand Up @@ -202,12 +202,8 @@ func (cd *containerData) getEgressNetworkNeighbors(containerID string, namespace
func (cd *containerData) createNetworkNeighbor(containerID string, networkEvent NetworkEvent, namespace string, k8sClient k8sclient.K8sClientInterface, dnsResolverClient dnsmanager.DNSResolver) *v1beta1.NetworkNeighbor {
var neighborEntry v1beta1.NetworkNeighbor

portIdentifier := generatePortIdentifierFromEvent(networkEvent)
neighborEntry.Ports = []v1beta1.NetworkPort{{
Protocol: v1beta1.Protocol(networkEvent.Protocol),
Port: ptr.To(int32(networkEvent.Port)),
Name: portIdentifier,
}}
enforcementPorts := []uint16{networkEvent.Port}
var serviceWorkload k8sinterface.IWorkload

if networkEvent.Destination.Kind == EndpointKindPod {
// For Pods, we need to remove the default labels
Expand All @@ -230,6 +226,7 @@ func (cd *containerData) createNetworkNeighbor(containerID string, networkEvent
helpers.String("service name", networkEvent.Destination.Name))
return nil
}
serviceWorkload = svc

var selector map[string]string
if svc.GetName() == "kubernetes" && svc.GetNamespace() == "default" {
Expand Down Expand Up @@ -270,6 +267,18 @@ func (cd *containerData) createNetworkNeighbor(containerID string, networkEvent
}
}

if networkEvent.Destination.Kind == EndpointKindService && serviceWorkload != nil && k8sClient != nil {
enforcementPorts = resolveServiceEnforcementPorts(
k8sClient,
networkEvent.Destination.Namespace,
networkEvent.Destination.Name,
serviceWorkload,
networkEvent.Port,
networkEvent.Protocol,
)
}
neighborEntry.Ports = buildNetworkPorts(networkEvent.Protocol, enforcementPorts)

neighborEntry.Type = InternalTrafficType
if neighborEntry.NamespaceSelector == nil && neighborEntry.PodSelector == nil {
neighborEntry.Type = ExternalTrafficType
Expand Down
Loading