getMultusAdmissionControllerReplicas for non-hypershift externalTopol…

…ogy clusters a5edddf introduced a change that doesn't work on non-hypershift clusters with external controllplane. Re-introduce the original logic for this type of clusters. Signed-off-by: Patryk Diak <pdiak@redhat.com>
kyrtapz · Feb 7, 2024 · 21a564c · 21a564c
1 parent ad94f41
commit 21a564c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 8 deletions.
diff --git a/pkg/network/multus_admission_controller.go b/pkg/network/multus_admission_controller.go
@@ -50,7 +50,8 @@ func renderMultusAdmissonControllerConfig(manifestDir string, externalControlPla
 	objs := []*uns.Unstructured{}
 	var err error
 
-	replicas := getMultusAdmissionControllerReplicas(bootstrapResult)
+	hsc := hypershift.NewHyperShiftConfig()
+	replicas := getMultusAdmissionControllerReplicas(bootstrapResult, hsc.Enabled)
 	if ignoredNamespaces == "" {
 		ignoredNamespaces, err = getOpenshiftNamespaces(client)
 		if err != nil {
@@ -68,7 +69,6 @@ func renderMultusAdmissonControllerConfig(manifestDir string, externalControlPla
 	data.Data["ExternalControlPlane"] = externalControlPlane
 	data.Data["Replicas"] = replicas
 	// Hypershift
-	hsc := hypershift.NewHyperShiftConfig()
 	data.Data["HyperShiftEnabled"] = hsc.Enabled
 	data.Data["ManagementClusterName"] = names.ManagementClusterName
 	data.Data["AdmissionControllerNamespace"] = "openshift-multus"

diff --git a/pkg/network/render.go b/pkg/network/render.go
@@ -735,10 +735,15 @@ func renderAdditionalNetworks(conf *operv1.NetworkSpec, manifestDir string) ([]*
 	return out, nil
 }
 
-func getMultusAdmissionControllerReplicas(bootstrapResult *bootstrap.BootstrapResult) int {
+func getMultusAdmissionControllerReplicas(bootstrapResult *bootstrap.BootstrapResult, hyperShiftEnabled bool) int {
 	replicas := 2
 	if bootstrapResult.Infra.ControlPlaneTopology == configv1.ExternalTopologyMode {
-		if bootstrapResult.Infra.HostedControlPlane.ControllerAvailabilityPolicy == hypershift.SingleReplica {
+		// In HyperShift check HostedControlPlane.ControllerAvailabilityPolicy, otherwise rely on Infra.InfrastructureTopology
+		if hyperShiftEnabled {
+			if bootstrapResult.Infra.HostedControlPlane.ControllerAvailabilityPolicy == hypershift.SingleReplica {
+				replicas = 1
+			}
+		} else if bootstrapResult.Infra.InfrastructureTopology == configv1.SingleReplicaTopologyMode {
 			replicas = 1
 		}
 	} else if bootstrapResult.Infra.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {

diff --git a/pkg/network/render_test.go b/pkg/network/render_test.go
@@ -410,15 +410,16 @@ func TestRenderUnknownNetwork(t *testing.T) {
 
 func Test_getMultusAdmissionControllerReplicas(t *testing.T) {
 	type args struct {
-		bootstrapResult *bootstrap.BootstrapResult
+		bootstrapResult   *bootstrap.BootstrapResult
+		hypershiftEnabled bool
 	}
 	tests := []struct {
 		name string
 		args args
 		want int
 	}{
 		{
-			name: "External control plane, highly available infra",
+			name: "External control plane, HyperShift,  highly available infra",
 			args: args{
 				bootstrapResult: &bootstrap.BootstrapResult{
 					Infra: bootstrap.InfraStatus{
@@ -428,11 +429,12 @@ func Test_getMultusAdmissionControllerReplicas(t *testing.T) {
 						},
 					},
 				},
+				hypershiftEnabled: true,
 			},
 			want: 2,
 		},
 		{
-			name: "External control plane, single-replica infra",
+			name: "External control plane, HyperShift, single-replica infra",
 			args: args{
 				bootstrapResult: &bootstrap.BootstrapResult{
 					Infra: bootstrap.InfraStatus{
@@ -442,6 +444,31 @@ func Test_getMultusAdmissionControllerReplicas(t *testing.T) {
 						},
 					},
 				},
+				hypershiftEnabled: true,
+			},
+			want: 1,
+		},
+		{
+			name: "External control plane, highly available infra",
+			args: args{
+				bootstrapResult: &bootstrap.BootstrapResult{
+					Infra: bootstrap.InfraStatus{
+						ControlPlaneTopology:   configv1.ExternalTopologyMode,
+						InfrastructureTopology: configv1.HighlyAvailableTopologyMode,
+					},
+				},
+			},
+			want: 2,
+		},
+		{
+			name: "External control plane, single-replica infra",
+			args: args{
+				bootstrapResult: &bootstrap.BootstrapResult{
+					Infra: bootstrap.InfraStatus{
+						ControlPlaneTopology:   configv1.ExternalTopologyMode,
+						InfrastructureTopology: configv1.SingleReplicaTopologyMode,
+					},
+				},
 			},
 			want: 1,
 		},
@@ -496,7 +523,7 @@ func Test_getMultusAdmissionControllerReplicas(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := getMultusAdmissionControllerReplicas(tt.args.bootstrapResult); got != tt.want {
+			if got := getMultusAdmissionControllerReplicas(tt.args.bootstrapResult, tt.args.hypershiftEnabled); got != tt.want {
 				t.Errorf("getMultusAdmissionControllerReplicas() = %v, want %v", got, tt.want)
 			}
 		})