[NPM] L1Vh Endpoints Fix for NPM Lite

npm/cmd/start.go

@@ -130,6 +130,8 @@ func start(config npmconfig.Config, flags npmconfig.Flags) error {
 				options.FieldSelector = "spec.nodeName=" + models.GetNodeName()
 			}),
 		)
+		npmV2DataplaneCfg.IsL1VHNode = config.Toggles.IsL1VHNode
+		npmV2DataplaneCfg.EnableNPMLite = config.Toggles.EnableNPMLite
 	}
 	k8sServerVersion := k8sServerVersion(clientset)
 

npm/config/config.go

@@ -52,6 +52,7 @@ var DefaultConfig = Config{
 		// NetPolInBackground is currently used in Linux to apply NetPol controller Add events in the background
 		NetPolInBackground: true,
 		EnableNPMLite:      false,
+		IsL1VHNode:         false,
 	},
 }
 
@@ -96,6 +97,7 @@ type Toggles struct {
 	// NetPolInBackground
 	NetPolInBackground bool
 	EnableNPMLite      bool
+	IsL1VHNode         bool
 }
 
 type Flags struct {

npm/examples/windows/azure-npm-lite-win.yaml

@@ -154,6 +154,7 @@ data:
             "ApplyIPSetsOnNeed":       false,
             "ApplyInBackground":       true,
             "NetPolInBackground":      true
-            "EnableNPMLite":           true
+            "EnableNPMLite":           true,
+            "IsL1VHNode":              true
         }
     }

npm/pkg/dataplane/dataplane.go

@@ -45,6 +45,8 @@ type Config struct {
 	NetPolInBackground bool
 	MaxPendingNetPols  int
 	NetPolInterval     time.Duration
+	IsL1VHNode         bool
+	EnableNPMLite      bool
 	*ipsets.IPSetManagerCfg
 	*policies.PolicyManagerCfg
 }

npm/pkg/dataplane/dataplane_windows.go

@@ -52,6 +52,14 @@ func (dp *DataPlane) initializeDataPlane() error {
 	}
 	// Filter out any endpoints that are not in "AttachedShared" State. All running Windows pods with networking must be in this state.
 	filterMap := map[string]uint16{"State": hcnEndpointStateAttachedSharing}
+	klog.Info("State:hcnEndpointStateAttachedSharing ")
+
+	// if npm lite is enabled and running on l1vh node, filter out any endpoints that are not in "Attached" State
+	if dp.EnableNPMLite && dp.IsL1VHNode {
+		klog.Info("NPM lite is running on L1VH Node")
+		filterMap = map[string]uint16{"State": hcnEndpointStateAttached}
+	}
+
 	filter, err := json.Marshal(filterMap)
 	if err != nil {
 		return npmerrors.SimpleErrorWrapper("failed to marshal endpoint filter map", err)