Cherry pick from master

[amitlimaye]

Description

Changes proposed in this pull request.

Test plan

Outline the test plan used to test this change before merging it.

Fixes #.

[aporeto-bot]

/build - automatically fired by gogo with following PRs and commit SHAs v1.0.0

[
  {
    "project": "",
    "component": "enforcerd",
    "pr-id": "1626",
    "commit-sha": "042d4db9221260657eaded3eccb3e489d435076c",
    "pipeline": "release-3.14.0"
  },
  {
    "project": "",
    "component": "trireme-lib",
    "pr-id": "1007",
    "commit-sha": "8a32e0ecd0c6d4ed476457a722444931092145ae",
    "pipeline": "release-3.14.0"
  }
]

[codecov[bot]]

Codecov Report

Merging #1007 into release-3.14.0 will decrease coverage by 0.00%. The diff coverage is 75.00%.

@@                Coverage Diff                 @@
##           release-3.14.0    #1007      +/-   ##
==================================================
- Coverage           55.40%   55.39%   -0.01%     
==================================================
  Files                 124      124              
  Lines               11998    12043      +45     
==================================================
+ Hits                 6647     6671      +24     
- Misses               4716     4741      +25     
+ Partials              635      631       -4     

Impacted Files	Coverage Δ
...ller/internal/enforcer/nfqdatapath/datapath_udp.go	0.00% <0.00%> (ø)
...troller/internal/enforcer/nfqdatapath/nfq_linux.go	0.00% <0.00%> (ø)
utils/cgnetcls/netcls.go	0.00% <ø> (ø)
...ller/internal/enforcer/nfqdatapath/datapath_tcp.go	53.16% <37.50%> (ø)
...oller/internal/supervisor/iptablesctrl/iptables.go	55.06% <40.00%> (-0.32%)	:arrow_down:
...ntroller/internal/enforcer/nfqdatapath/datapath.go	57.67% <100.00%> (+0.53%)	:arrow_up:
...ontroller/internal/supervisor/iptablesctrl/acls.go	68.91% <100.00%> (+0.51%)	:arrow_up:
...ller/internal/supervisor/iptablesctrl/templates.go	87.16% <100.00%> (+1.44%)	:arrow_up:
controller/pkg/fqconfig/fqconfig.go	85.22% <100.00%> (+2.56%)	:arrow_up:
monitor/extractors/linux.go	48.78% <0.00%> (-21.96%)	:arrow_down:

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 891e0f8...8a32e0e. Read the comment docs.