Skip to content

[release-4.13] OCPBUGS-10243: update sysconfwatch-controller logging #1630

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
Apr 10, 2023
Merged

[release-4.13] OCPBUGS-10243: update sysconfwatch-controller logging #1630

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 pkg/util/net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,24 @@ import (
"k8s.io/klog/v2"
)

var previousGatewayIP string = ""

func GetHostIP() (string, error) {
// Prefer OVN-K gateway IP if it is the CNI
gatewayIP, err := ovn.GetOVNGatewayIP()
if err != nil && !strings.Contains(err.Error(), "no such network interface") {
return "", err
}
klog.V(2).Infof("ovn gateway IP address: %s", gatewayIP)
if gatewayIP != previousGatewayIP {
previousGatewayIP = gatewayIP
klog.V(2).Infof("ovn gateway IP address: %s", gatewayIP)
}

ip, err := net.ChooseHostInterface()
if err == nil {
return ip.String(), nil
}
klog.V(2).Infof("failed to find default route IP address: %v", err)
klog.V(2).Infof("could not find default route IP address, using ovn gateway IP %q as host IP: %v", gatewayIP, err)

return gatewayIP, nil
}
Expand Down