Skip to content

[NPM] Fixing log noise and removing GetClusterState #784

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

Merged
merged 2 commits into from
Feb 16, 2021
Merged

[NPM] Fixing log noise and removing GetClusterState #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2dfd37
Fixing log noise for hotnet pods
vakalapa Feb 12, 2021
9f38595
Removing GetClusterState usage
vakalapa Feb 12, 2021
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
14 changes: 10 additions & 4 deletions npm/npm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,16 @@ func (npMgr *NetworkPolicyManager) SendClusterMetrics() {

for {
<-heartbeat
clusterState := npMgr.GetClusterState()
podCount.Value = float64(clusterState.PodCount)
nsCount.Value = float64(clusterState.NsCount)
nwPolicyCount.Value = float64(clusterState.NwPolicyCount)
npMgr.Lock()
podCount.Value = float64(len(npMgr.podMap))
//Reducing one to remove all-namespaces ns obj
nsCount.Value = float64(len(npMgr.nsMap) - 1)
nwPolCount := 0
for _, ns := range npMgr.nsMap {
nwPolCount = nwPolCount + len(ns.rawNpMap)
}
nwPolicyCount.Value = float64(nwPolCount)
npMgr.Unlock()

metrics.SendMetric(podCount)
metrics.SendMetric(nsCount)
Expand Down
10 changes: 5 additions & 5 deletions npm/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,21 @@ func (npMgr *NetworkPolicyManager) UpdatePod(oldPodObj, newPodObj *corev1.Pod) e
return nil
}

if isInvalidPodUpdate(oldPodObj, newPodObj) {
return nil
}

// today K8s does not allow updating HostNetwork flag for an existing Pod. So NPM can safely
// check on the oldPodObj for hostNework value
if isHostNetworkPod(oldPodObj) {
log.Logf(
"POD UPDATING ignored for HostNetwork Pod:\n old pod: [%s/%s/%+v/%s/%s]\n new pod: [%s/%s/%+v/%s/%s]",
"POD UPDATING ignored for HostNetwork Pod:\n old pod: [%s/%s/%s]\n new pod: [%s/%s/%s]",
oldPodObj.ObjectMeta.Namespace, oldPodObj.ObjectMeta.Name, oldPodObj.Status.PodIP,
newPodObj.ObjectMeta.Namespace, newPodObj.ObjectMeta.Name, newPodObj.Status.PodIP,
)
return nil
}

if isInvalidPodUpdate(oldPodObj, newPodObj) {
return nil
}

var (
err error
oldPodObjNs = oldPodObj.ObjectMeta.Namespace
Expand Down