Skip to content

[release-4.9] Bug 2054139: Don't return err when annotation cannot be unmarshalled #954

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
Feb 22, 2022
Merged

[release-4.9] Bug 2054139: Don't return err when annotation cannot be unmarshalled #954

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
7 changes: 4 additions & 3 deletions go-controller/pkg/ovn/egressgw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ func (oc *Controller) addPodExternalGW(pod *kapi.Pod) error {

foundGws, err := getExGwPodIPs(pod)
if err != nil {
return err
klog.Errorf("Error getting exgw IPs for pod: %s, error: %v", pod.Name, err)
oc.recordPodEvent(err, pod)
return nil
}

// if we found any gateways then we need to update current pods routing in the relevant namespace
Expand Down Expand Up @@ -833,10 +835,9 @@ func getExGwPodIPs(gatewayPod *kapi.Pod) ([]net.IP, error) {
}
}
} else {
klog.Errorf("Ignoring pod %s as an external gateway candidate. Invalid combination "+
return nil, fmt.Errorf("ignoring pod %s as an external gateway candidate. Invalid combination "+
"of host network: %t and routing-network annotation: %s", gatewayPod.Name, gatewayPod.Spec.HostNetwork,
gatewayPod.Annotations[routingNetworkAnnotation])
return nil, nil
}
return foundGws, nil
}
Expand Down