OCPBUGS-64793: Infrastructure Topology calculation is wrong

If masters are schedulable then all nodes, not just non-controlplane nodes, should
be taken into account when deciding what we tell OLM operators about the topology.

Example:
1.Deploy a cluster with 3 CP nodes (schedulable) and 1 Worker Node
2.Inspect infrastructureTopology attribute of the cluster

Expect: infrastructureTopology= HighlyAvailableTopologyMode

Author: barbacbd

pkg/asset/manifests/ingress_test.go

@@ -143,7 +143,7 @@ func TestGenerateIngerssDefaultPlacement(t *testing.T) {
 			name:                      "aws multi-node with 1 day-1 worker",
 			installConfigBuildOptions: []icOption{icBuild.forAWS()},
 			controlPlaneTopology:      configv1.HighlyAvailableTopologyMode,
-			infrastructureTopology:    configv1.SingleReplicaTopologyMode,
+			infrastructureTopology:    configv1.HighlyAvailableTopologyMode,
 			expectedIngressAWSLBType:  configv1.Classic,
 			expectedIngressPlacement:  configv1.DefaultPlacementWorkers,
 		},
@@ -194,7 +194,7 @@ func TestGenerateIngerssDefaultPlacement(t *testing.T) {
 			name:                      "none-platform multi-node with 1 day-1 worker",
 			installConfigBuildOptions: []icOption{icBuild.forNone()},
 			controlPlaneTopology:      configv1.HighlyAvailableTopologyMode,
-			infrastructureTopology:    configv1.SingleReplicaTopologyMode,
+			infrastructureTopology:    configv1.HighlyAvailableTopologyMode,
 			expectedIngressPlacement:  configv1.DefaultPlacementWorkers,
 		},
 		{

pkg/asset/manifests/topologies.go

@@ -30,7 +30,7 @@ func determineTopologies(installConfig *types.InstallConfig) (controlPlaneTopolo
 	}
 
 	switch numOfWorkers {
-	case 0:
+	case 0, 1:
 		// Two node deployments with 0 workers mean that the control plane nodes are treated as workers
 		// in that situation we have decided that it is appropriate to set the infrastructureTopology to HA.
 		// All other configuration for different worker count are respected with the original intention.
@@ -39,8 +39,6 @@ func determineTopologies(installConfig *types.InstallConfig) (controlPlaneTopolo
 		} else {
 			infrastructureTopology = controlPlaneTopology
 		}
-	case 1:
-		infrastructureTopology = configv1.SingleReplicaTopologyMode
 	default:
 		infrastructureTopology = configv1.HighlyAvailableTopologyMode
 	}

pkg/asset/manifests/topologies_test.go

@@ -125,6 +125,21 @@ func Test_DetermineTopologies(t *testing.T) {
 			expectedControlPlane: configv1.HighlyAvailableTopologyMode,
 			expectedInfra:        configv1.HighlyAvailableTopologyMode,
 		},
+		{
+			desc: "should set infra to HA controlPlane and compute from controlPlane value",
+			installConfig: &types.InstallConfig{
+				ControlPlane: &types.MachinePool{
+					Replicas: ptr.To[int64](3),
+				},
+				Compute: []types.MachinePool{
+					{
+						Replicas: ptr.To[int64](1),
+					},
+				},
+			},
+			expectedControlPlane: configv1.HighlyAvailableTopologyMode,
+			expectedInfra:        configv1.HighlyAvailableTopologyMode,
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {