Skip to content

[release-4.13] OCPBUGS-15140: Fix stale SNAT entries for completed pods #1715

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
openshift-merge-robot merged 1 commit into from
Jun 20, 2023
Merged

[release-4.13] OCPBUGS-15140: Fix stale SNAT entries for completed pods #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions go-controller/pkg/ovn/egressip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,14 +1089,19 @@ func (oc *DefaultNetworkController) addPodEgressIPAssignmentsWithLock(name strin
// work on ovnkube-master restarts when all egress IP handlers will most likely
// match and perform the setup for the same pod and status multiple times over.
func (oc *DefaultNetworkController) addPodEgressIPAssignments(name string, statusAssignments []egressipv1.EgressIPStatusItem, pod *kapi.Pod) error {
podKey := getPodKey(pod)
// If pod is already in succeeded or failed state, return it without proceeding further.
if util.PodCompleted(pod) {
klog.Infof("Pod %s is already in completed state, skipping egress ip assignment", podKey)
return nil
}
// If statusAssignments is empty just return, not doing this will delete the
// external GW set up, even though there might be no egress IP set up to
// perform.
if len(statusAssignments) == 0 {
return nil
}
var remainingAssignments []egressipv1.EgressIPStatusItem
podKey := getPodKey(pod)
// Retrieve the pod's networking configuration from the
// logicalPortCache. The reason for doing this: a) only normal network
// pods are placed in this cache, b) once the pod is placed here we know
Expand Down Expand Up @@ -2374,7 +2379,7 @@ func (e *egressIPController) addExternalGWPodSNAT(podNamespace, podName string,
// external GW setup in those cases.
func (e *egressIPController) addExternalGWPodSNATOps(ops []ovsdb.Operation, podNamespace, podName string, status egressipv1.EgressIPStatusItem) ([]ovsdb.Operation, error) {
if config.Gateway.DisableSNATMultipleGWs {
if pod, err := e.watchFactory.GetPod(podNamespace, podName); err == nil && pod.Spec.NodeName == status.Node {
if pod, err := e.watchFactory.GetPod(podNamespace, podName); err == nil && pod.Spec.NodeName == status.Node && util.PodNeedsSNAT(pod) {
// if the pod still exists, add snats to->nodeIP (on the node where the pod exists) for these podIPs after deleting the snat to->egressIP
// NOTE: This needs to be done only if the pod was on the same node as egressNode
extIPs, err := getExternalIPsGR(e.watchFactory, pod.Spec.NodeName)
Expand Down
Loading