Fix 5840

[gsquared94]

Fixes: #5840

Description

See #5840 (comment). This PR reverts #5809 and #5826

[tejal29]

LGTM

[briandealwis]

I like commit 5680bb1

[codecov]

Codecov Report

Merging #5858 (5680bb1) into master (540a4a0) will decrease coverage by 0.02%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master    #5858      +/-   ##
==========================================
- Coverage   70.84%   70.81%   -0.03%     
==========================================
  Files         447      446       -1     
  Lines       16842    16816      -26     
==========================================
- Hits        11931    11909      -22     
+ Misses       4028     4023       -5     
- Partials      883      884       +1     

Impacted Files	Coverage Δ
pkg/skaffold/deploy/deploy_mux.go	88.00% <ø> (+30.10%)	⬆️
pkg/skaffold/deploy/kpt/kpt.go	74.22% <ø> (-0.18%)	⬇️
pkg/skaffold/deploy/kubectl/kubectl.go	65.18% <ø> (-0.44%)	⬇️
pkg/skaffold/deploy/kustomize/kustomize.go	74.07% <ø> (-0.48%)	⬇️
...kubernetes/portforward/port_forward_integration.go	0.00% <0.00%> (ø)
pkg/skaffold/runner/v1/portforwarder.go	22.22% <22.22%> (-44.45%)	⬇️
pkg/skaffold/runner/v1/logger.go	40.00% <40.00%> (ø)
...g/skaffold/kubernetes/portforward/entry_manager.go	92.00% <66.66%> (+0.16%)	⬆️
pkg/skaffold/runner/v1/deploy.go	53.00% <71.42%> (+0.95%)	⬆️
...affold/kubernetes/portforward/forwarder_manager.go	52.38% <75.00%> (+2.38%)	⬆️
... and 11 more

---

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 540a4a0...5680bb1. Read the comment docs.