Skip to content

Commit 6989215

Browse files
log: [NPM-WIN] clean up some logs (#1807)
clean up some logs Co-authored-by: Vamsi Kalapala <[email protected]>
1 parent 0d4c65f commit 6989215

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

npm/pkg/dataplane/dataplane_windows.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,6 @@ func (dp *DataPlane) getPodEndpoints(includeRemoteEndpoints bool) ([]*hcn.HostCo
317317
if includeRemoteEndpoints || e.Flags == hcn.EndpointFlagsNone {
318318
// having EndpointFlagsNone means it is a local endpoint
319319
localEndpoints = append(localEndpoints, e)
320-
} else {
321-
// TODO remove for GA
322-
klog.Infof("ignoring remote endpoint. ID: %s, IP configs: %+v", e.Id, e.IpConfigurations)
323320
}
324321
}
325322
return localEndpoints, nil

npm/pkg/dataplane/policies/policymanager_windows.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ func newStaleChains() *staleChains {
3535
func (pMgr *PolicyManager) bootup(epIDs []string) error {
3636
var aggregateErr error
3737
for _, epID := range epIDs {
38-
err := pMgr.removePolicyByEndpointID("", epID, 0, resetAllACLs)
38+
// ruleID="RESET-ALL" is only used for logging when specifying shouldResetACLs=resestAllACLs
39+
err := pMgr.removePolicyByEndpointID("RESET-ALL", epID, 0, resetAllACLs)
3940
if err != nil {
4041
if aggregateErr == nil {
4142
aggregateErr = fmt.Errorf("skipping resetting policies on %s ID Endpoint with err: %w", epID, err)
@@ -178,7 +179,7 @@ func (pMgr *PolicyManager) removePolicyByEndpointID(ruleID, epID string, noOfRul
178179
if err != nil {
179180
// IsNotFound check is being skipped at times. So adding a redundant check here.
180181
if isNotFoundErr(err) || strings.Contains(err.Error(), "endpoint was not found") {
181-
klog.Infof("[PolicyManagerWindows] ignoring remove policy since the endpoint wasn't found. the corresponding pod might be deleted. policy: %s, endpoint: %s, err: %s", ruleID, epID, err.Error())
182+
klog.Infof("[PolicyManagerWindows] ignoring remove policy since the endpoint wasn't found. the corresponding pod might be deleted. policy: %s, endpoint: %s, HNS response: %s", ruleID, epID, err.Error())
182183
return nil
183184
}
184185
return fmt.Errorf("[PolicyManagerWindows] failed to remove policy while getting the endpoint. policy: %s, endpoint: %s, err: %w", ruleID, epID, err)

0 commit comments

Comments
 (0)