Merge pull request #29887 from smg247/microshift-set-network

openshift-merge-bot[bot] · web-flow · commit 9c87080acbe8 · 2025-06-05T10:43:57.000Z
TRT-1854: set network for MicroShift to OVNKubernetes
diff --git a/pkg/clioptions/clusterdiscovery/provider.go b/pkg/clioptions/clusterdiscovery/provider.go
@@ -110,7 +110,7 @@ func DecodeProvider(providerTypeOrJSON string, dryRun, discover bool, clusterSta
 		config := &ClusterConfiguration{
 			ProviderName: "skeleton",
 		}
-		// Add NoOptionalCapabilities for MicroShift
+		// Add special configurations for MicroShift
 		coreClient, err := e2e.LoadClientset(true)
 		if err != nil {
 			log.WithError(err).Error("error in LoadClientset")
@@ -123,6 +123,8 @@ func DecodeProvider(providerTypeOrJSON string, dryRun, discover bool, clusterSta
 		}
 		if isMicroShift {
 			config.HasNoOptionalCapabilities = true
+			// Currently, for the sake of testing, MicroShift can always be assumed to be using OVNKubernetes
+			config.NetworkPlugin = "OVNKubernetes"
 		}
 
 		return config, nil

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func DecodeProvider(providerTypeOrJSON string, dryRun, discover bool, clusterSta`
`110`	`110`	`config := &ClusterConfiguration{`
`111`	`111`	`ProviderName: "skeleton",`
`112`	`112`	`}`
`113`		`- // Add NoOptionalCapabilities for MicroShift`
	`113`	`+ // Add special configurations for MicroShift`
`114`	`114`	`coreClient, err := e2e.LoadClientset(true)`
`115`	`115`	`if err != nil {`
`116`	`116`	`log.WithError(err).Error("error in LoadClientset")`
`@@ -123,6 +123,8 @@ func DecodeProvider(providerTypeOrJSON string, dryRun, discover bool, clusterSta`
`123`	`123`	`}`
`124`	`124`	`if isMicroShift {`
`125`	`125`	`config.HasNoOptionalCapabilities = true`
	`126`	`+ // Currently, for the sake of testing, MicroShift can always be assumed to be using OVNKubernetes`
	`127`	`+ config.NetworkPlugin = "OVNKubernetes"`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`return config, nil`