Merge pull request #29904 from smg247/microshift-single-replica

TRT-2068: additional defaults for MicroShift

Author: openshift-merge-bot[bot]

pkg/clioptions/clusterdiscovery/provider.go

@@ -125,6 +125,9 @@ func DecodeProvider(providerTypeOrJSON string, dryRun, discover bool, clusterSta
 			config.HasNoOptionalCapabilities = true
 			// Currently, for the sake of testing, MicroShift can always be assumed to be using OVNKubernetes
 			config.NetworkPlugin = "OVNKubernetes"
+			config.SingleReplicaTopology = true
+			// Currently, for the sake of testing, MicroShift can always be assumed to be using ipv4
+			config.IPFamily = "ipv4"
 		}
 
 		return config, nil

pkg/test/ginkgo/cmd_runsuite.go

@@ -787,11 +787,24 @@ func determineEnvironmentFlags(ctx context.Context, upgrade bool, dryRun bool) (
 
 	envFlagBuilder := &extensions.EnvironmentFlagsBuilder{}
 	envFlagBuilder.
-		AddPlatform(config.ProviderName).
 		AddNetwork(config.NetworkPlugin).
 		AddNetworkStack(config.IPFamily).
 		AddExternalConnectivity(determineExternalConnectivity(config))
 
+	platform := config.ProviderName
+	// MicroShift is defined as "skeleton" in the providerName, but the flag should be "none"
+	if platform == "skeleton" {
+		platform = "none"
+	}
+	envFlagBuilder.AddPlatform(platform)
+
+	if config.SingleReplicaTopology {
+		// In cases like Microshift, we will not be able to determine the clusterState,
+		// so topology will be unset unless we default it properly here
+		singleReplicaTopology := configv1.SingleReplicaTopologyMode
+		envFlagBuilder.AddTopology(&singleReplicaTopology)
+	}
+
 	clientConfig, err := clientconfigv1.NewForConfig(restConfig)
 	if err != nil {
 		return nil, err