Log the version speculation only once

Author: hongkailiu

pkg/cli/admin/release/extract_tools.go

@@ -1301,12 +1301,12 @@ func findClusterIncludeConfigFromInstallConfig(_ context.Context, installConfigP
 		} else {
 			if data.Capabilities.BaselineCapabilitySet == configv1.ClusterVersionCapabilitySetCurrent {
 				klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the actual %s capability set may differ.", reportedVersion, data.Capabilities.BaselineCapabilitySet)
+			} else {
+				klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the known capability sets may differ.", reportedVersion)
 			}
 			config.Capabilities.EnabledCapabilities = append(config.Capabilities.EnabledCapabilities, enabled...)
 		}
 		config.Capabilities.EnabledCapabilities = append(config.Capabilities.EnabledCapabilities, data.Capabilities.AdditionalEnabledCapabilities...)
-
-		klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the known capability sets may differ.", reportedVersion)
 		config.Capabilities.KnownCapabilities = configv1.KnownClusterVersionCapabilities
 	}
 
@@ -1338,11 +1338,17 @@ func findClusterIncludeConfig(ctx context.Context, restConfig *rest.Config, repo
 			capSet = capabilitiesSpec.BaselineCapabilitySet
 		}
 		deepCopy := clusterVersion.Status.Capabilities.DeepCopy()
+		// The logging here is to tell the cluster admin that we are using the oc version as the target version.
+		// TODO: We get the target version from the pull spec that we are extracting
+		// and use it in the findClusterIncludeConfigFromInstallConfig function as well
+		// and then we can remove the "is most accurate" sentence in the command description.
+		// https://github.com/openshift/oc/blob/def90a65fcbad5d7e54add49975e9c3daa92a4f9/pkg/cli/admin/release/extract.go#L101-L102
 		if capSet == configv1.ClusterVersionCapabilitySetCurrent {
 			klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the actual %s capability set may differ.", reportedVersion, capSet)
+		} else {
+			klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the known capability sets may differ.", reportedVersion)
 		}
 		deepCopy.EnabledCapabilities = append(deepCopy.EnabledCapabilities, configv1.ClusterVersionCapabilitySets[capSet]...)
-		klog.Infof("If the eventual cluster will not be the same minor version as this %s 'oc', the known capability sets may differ.", reportedVersion)
 		deepCopy.KnownCapabilities = configv1.KnownClusterVersionCapabilities
 		config.Capabilities = deepCopy
 	}