Merge pull request #939 from eggfoobar/arbiter-node-support

OCPEDGE-1345: feat: add arbiter node support for HA

Author: openshift-merge-bot[bot]

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-test/deep v1.0.5
 	github.com/google/go-cmp v0.6.0
-	github.com/openshift/api v0.0.0-20241111120719-57564f6994b5
+	github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf
 	github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
 	github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
 	github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39

go.sum

@@ -146,8 +146,8 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
-github.com/openshift/api v0.0.0-20241111120719-57564f6994b5 h1:VOUXgYKuQ4YzDUPajhmmROkCYrdpyDZFFCj1e4N5BYU=
-github.com/openshift/api v0.0.0-20241111120719-57564f6994b5/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
+github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf h1:v0zcEm7GikYbs/N+YLLpKV75ASm7WpMRiSDZpvJvXnk=
+github.com/openshift/api v0.0.0-20241211151016-1a7b90faeadf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
 github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0zE2bmdVvaEd18VXuGYQdJJ1FYJu4MIDW9PYZWc9No=
 github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=

pkg/console/subresource/deployment/deployment.go

@@ -128,8 +128,12 @@ func DefaultDownloadsDeployment(
 // ShouldDeployHA returns true if the console should be deployed in HA mode.
 // If the control plane is externalized, the console should be deployed in HA mode based on the InfrastructureTopology,
 // otherwise it should be deployed in HA mode based on the ControlPlaneTopology.
+//
+// On HighlyAvailableArbiter control plane topologies, with a minimum of two full sized master nodes, we also deploy HA
+// since the default for HA is 2 pods.
 func ShouldDeployHA(infrastructureConfig *configv1.Infrastructure) bool {
 	return infrastructureConfig.Status.ControlPlaneTopology == configv1.HighlyAvailableTopologyMode ||
+		infrastructureConfig.Status.ControlPlaneTopology == configv1.HighlyAvailableArbiterMode ||
 		(infrastructureConfig.Status.ControlPlaneTopology == configv1.ExternalTopologyMode &&
 			infrastructureConfig.Status.InfrastructureTopology == configv1.HighlyAvailableTopologyMode)
 }