Bundle is always defined and can be used to retrieve openshift version

crc-org · Nov 5, 2020 · bb5adac · bb5adac
1 parent 822dc75
commit bb5adac
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/pkg/crc/machine/machine.go b/pkg/crc/machine/machine.go
@@ -557,14 +557,12 @@ func (client *client) Status() (*ClusterStatusResult, error) {
 	ocConfig := oc.UseOCWithSSH(sshRunner)
 
 	openshiftStatus := "Stopped"
-	openshiftVersion := ""
 	operatorsStatus, err := cluster.GetClusterOperatorsStatus(ocConfig)
 	if err != nil {
 		openshiftStatus = "Not Reachable"
 		logging.Debug(err.Error())
 	}
 	if operatorsStatus.Available {
-		openshiftVersion = crcBundleMetadata.GetOpenshiftVersion()
 		openshiftStatus = "Running"
 	}
 	if operatorsStatus.Degraded {
@@ -580,7 +578,7 @@ func (client *client) Status() (*ClusterStatusResult, error) {
 	return &ClusterStatusResult{
 		CrcStatus:        vmStatus,
 		OpenshiftStatus:  openshiftStatus,
-		OpenshiftVersion: openshiftVersion,
+		OpenshiftVersion: crcBundleMetadata.GetOpenshiftVersion(),
 		DiskUse:          diskUse,
 		DiskSize:         diskSize,
 	}, nil