Backport 1444 to 1.9

[grcevski]

Backports the fixes to #1444 to 1.9

[codecov]

Codecov Report

Attention: Patch coverage is 55.55556% with 4 lines in your changes missing coverage. Please review.

Project coverage is 80.97%. Comparing base (4a34748) to head (9c3dafa).

Files with missing lines	Patch %	Lines
pkg/internal/kube/store.go	62.50%	2 Missing and 1 partial ⚠️
pkg/kubecache/meta/informers.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##           release-1.9    #1445   +/-   ##
============================================
  Coverage        80.96%   80.97%           
============================================
  Files              146      146           
  Lines            14774    14777    +3     
============================================
+ Hits             11962    11965    +3     
- Misses            2229     2230    +1     
+ Partials           583      582    -1     

Flag	Coverage Δ
integration-test	58.61% <0.00%> (+0.11%)	⬆️
k8s-integration-test	59.81% <55.55%> (-0.08%)	⬇️
oats-test	33.99% <0.00%> (-0.01%)	⬇️
unittests	51.74% <55.55%> (-0.01%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.