Merge pull request #9756 from sadasu/backport-sno-validation

[release-4.19]  OCPBUGS-56811: Update Control Plane replica validation for Single Node OpenShift

Author: openshift-merge-bot[bot]

pkg/asset/machines/master.go

@@ -173,6 +173,18 @@ func (m *Master) Generate(ctx context.Context, dependencies asset.Parents) error
 	var ipClaims []ipamv1.IPAddressClaim
 	var ipAddrs []ipamv1.IPAddress
 	var controlPlaneMachineSet *machinev1.ControlPlaneMachineSet
+
+	// Check if SNO topology is supported on this platform
+	if pool.Replicas != nil && *pool.Replicas == 1 {
+		bootstrapInPlace := false
+		if ic.BootstrapInPlace != nil {
+			bootstrapInPlace = true
+		}
+		if !supportedSingleNodePlatform(bootstrapInPlace, ic.Platform.Name()) {
+			return fmt.Errorf("this install method does not support Single Node installation on platform %s", ic.Platform.Name())
+		}
+	}
+
 	switch ic.Platform.Name() {
 	case awstypes.Name:
 		subnets, err := aws.MachineSubnetsByZones(ctx, installConfig, awstypes.ClusterNodeSubnetRole)
@@ -888,3 +900,18 @@ func createAssetFiles(objects []interface{}, fileName string) ([]*asset.File, er
 
 	return assetFiles, nil
 }
+
+// supportedSingleNodePlatform indicates if the IPI Installer can be used to install SNO on
+// a platform.
+func supportedSingleNodePlatform(bootstrapInPlace bool, platformName string) bool {
+	switch platformName {
+	case awstypes.Name, gcptypes.Name, azuretypes.Name, powervstypes.Name:
+		// Single node OpenShift installations supported without `bootstrapInPlace`
+		return true
+	case nonetypes.Name, externaltypes.Name:
+		// Single node OpenShift installations supported with `bootstrapInPlace`
+		return bootstrapInPlace
+	default:
+		return false
+	}
+}

pkg/asset/machines/master_test.go

@@ -11,6 +11,7 @@ import (
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/yaml"
 
 	"github.com/openshift/installer/pkg/asset"
@@ -273,14 +274,14 @@ func TestBaremetalGeneratedAssetFiles(t *testing.T) {
 				},
 			},
 			ControlPlane: &types.MachinePool{
-				Replicas: pointer.Int64Ptr(1),
+				Replicas: ptr.To[int64](3),
 				Platform: types.MachinePoolPlatform{
 					BareMetal: &baremetal.MachinePool{},
 				},
 			},
 			Compute: []types.MachinePool{
 				{
-					Replicas: pointer.Int64Ptr(1),
+					Replicas: ptr.To[int64](1),
 					Platform: types.MachinePoolPlatform{},
 				},
 			},