Merge pull request #10207 from xiangpengzhao/fix-port-check

Merged by openshift-bot

Author: OpenShift Bot

pkg/ipfailover/keepalived/plugin.go

@@ -38,11 +38,12 @@ func NewIPFailoverConfiguratorPlugin(name string, f *clientcmd.Factory, options
 // GetWatchPort gets the port to monitor for the IP Failover configuration.
 func (p *KeepalivedPlugin) GetWatchPort() (int, error) {
 	port := p.Options.WatchPort
-	if port < 1 {
+	if port < 1 || port > 65535 {
+		glog.V(4).Infof("Warning: KeepAlived IP Failover config: %q - WatchPort: %d invalid, will default to %d", p.Name, port, ipfailover.DefaultWatchPort)
 		port = ipfailover.DefaultWatchPort
 	}
 
-	glog.V(4).Infof("KeepAlived IP Failover config: %q - WatchPort: %+v", p.Name, port)
+	glog.V(4).Infof("KeepAlived IP Failover config: %q - WatchPort: %d", p.Name, port)
 
 	return port, nil
 }

pkg/ipfailover/keepalived/plugin_test.go

@@ -111,6 +111,11 @@ func TestPluginGetWatchPort(t *testing.T) {
 			WatchPort: 9999,
 			Expected:  9999,
 		},
+		{
+			Name:      "service2",
+			WatchPort: 65535,
+			Expected:  65535,
+		},
 		{
 			Name:      "invalid-port",
 			WatchPort: -12345,
@@ -121,6 +126,11 @@ func TestPluginGetWatchPort(t *testing.T) {
 			WatchPort: -1,
 			Expected:  80,
 		},
+		{
+			Name:      "invalid-port-3",
+			WatchPort: 65536,
+			Expected:  80,
+		},
 		{
 			Name:      "zero-port",
 			WatchPort: 0,