Merge pull request #88 from Gal-Zaidman/release-4.4

Bug 1862898: Move haproxy port to 9445 due to conflict with KCM
openshift · Aug 19, 2020 · 83607e3 · 83607e3
2 parents 2ee5d62 + 900034e
commit 83607e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/monitor/monitor.go b/cmd/monitor/monitor.go
@@ -52,7 +52,7 @@ func main() {
 		},
 	}
 	rootCmd.Flags().Uint16("api-port", 6443, "Port where the OpenShift API listens at")
-	rootCmd.Flags().Uint16("lb-port", 9443, "Port where the API HAProxy LB will listen at")
+	rootCmd.Flags().Uint16("lb-port", 9445, "Port where the API HAProxy LB will listen at")
 	rootCmd.Flags().Uint16("stat-port", 50000, "Port where the HAProxy stats API will listen at")
 	rootCmd.Flags().Duration("check-interval", time.Second*6, "Time between monitor checks")
 	rootCmd.Flags().IP("api-vip", nil, "Virtual IP Address to reach the OpenShift API")

diff --git a/cmd/runtimecfg/runtimecfg.go b/cmd/runtimecfg/runtimecfg.go
@@ -166,7 +166,7 @@ func main() {
 	rootCmd.PersistentFlags().IP("ingress-vip", nil, "Virtual IP Address to reach the OpenShift Ingress Routers")
 	rootCmd.PersistentFlags().IP("dns-vip", nil, "Virtual IP Address to reach an OpenShift node resolving DNS server")
 	rootCmd.PersistentFlags().Uint16("api-port", 6443, "Port where the OpenShift API listens at")
-	rootCmd.PersistentFlags().Uint16("lb-port", 9443, "Port where the API HAProxy LB will listen at")
+	rootCmd.PersistentFlags().Uint16("lb-port", 9445, "Port where the API HAProxy LB will listen at")
 	rootCmd.PersistentFlags().Uint16("stat-port", 50000, "Port where the HAProxy stats API will listen at")
 	rootCmd.PersistentFlags().StringP("resolvconf-path", "r", "/etc/resolv.conf", "Optional path to a resolv.conf file to use to get upstream DNS servers")