The first part of the fix has been backported through https://github.com/openshift/sdn/pull/261. So reopening this to get that in.
https://github.com/openshift/sdn/pull/261 backported https://github.com/kubernetes/kubernetes/pull/95252 but not https://github.com/kubernetes/kubernetes/pull/96959 to the release-4.6 branch. It looks like bug 1879607 was tracking the same upstream fixes for the release-4.7 branch, where likewise https://github.com/kubernetes/kubernetes/pull/95252 was backported but https://github.com/kubernetes/kubernetes/pull/96959 was not. Bug 1879607 was marked CLOSED UPSTREAM, so I am following suit and closing this report likewise.