extract: figure out the target version from the pullspec

Author: hongkailiu

pkg/cli/admin/release/extract.go

@@ -354,6 +354,22 @@ func (o *ExtractOptions) Run(ctx context.Context) error {
 		}
 	}
 
+	var versionInImageConfig string
+	opts.ImageConfigCallback = func(imageConfig *dockerv1client.DockerImageConfig) {
+		if imageConfig == nil {
+			klog.Info("Cannot retrieve the version because no image configuration is provided in the image to extract")
+			return
+		}
+		if c := imageConfig.Config; c != nil {
+			if v, ok := c.Labels["io.openshift.release"]; ok {
+				klog.V(2).Infof("Retrieved the version from image configuration in the image to extract: %s", v)
+				versionInImageConfig = v
+			} else {
+				klog.Info("Cannot retrieve the version from image configuration in the image to extract")
+			}
+		}
+	}
+
 	var manifestsCallbacks []func(string, []manifest.Manifest, io.Reader, []configv1.ClusterVersionCapability) (bool, error)
 
 	var needEnabledCapabilities bool
@@ -371,9 +387,9 @@ func (o *ExtractOptions) Run(ctx context.Context) error {
 			}
 			if o.InstallConfig == "" {
 				needEnabledCapabilities = true
-				inclusionConfig, err = findClusterIncludeConfig(ctx, o.RESTConfig, reportedVersion)
+				inclusionConfig, err = findClusterIncludeConfig(ctx, o.RESTConfig, reportedVersion, versionInImageConfig)
 			} else {
-				inclusionConfig, err = findClusterIncludeConfigFromInstallConfig(ctx, o.InstallConfig, reportedVersion)
+				inclusionConfig, err = findClusterIncludeConfigFromInstallConfig(ctx, o.InstallConfig, reportedVersion, versionInImageConfig)
 				context = o.InstallConfig
 			}
 			if err != nil {

pkg/cli/admin/release/extract_tools.go

@@ -1270,7 +1270,7 @@ func (mr *ManifestReceiver) TarEntryCallbackDoneCallback() error {
 	return nil
 }
 
-func findClusterIncludeConfigFromInstallConfig(_ context.Context, installConfigPath, reportedVersion string) (manifestInclusionConfiguration, error) {
+func findClusterIncludeConfigFromInstallConfig(_ context.Context, installConfigPath, reportedVersion, versionInImageConfig string) (manifestInclusionConfiguration, error) {
 	config := manifestInclusionConfiguration{}
 
 	installConfigBytes, err := os.ReadFile(installConfigPath)
@@ -1299,21 +1299,23 @@ func findClusterIncludeConfigFromInstallConfig(_ context.Context, installConfigP
 		if enabled, ok := configv1.ClusterVersionCapabilitySets[data.Capabilities.BaselineCapabilitySet]; !ok {
 			return config, fmt.Errorf("unrecognized baselineCapabilitySet %q", data.Capabilities.BaselineCapabilitySet)
 		} 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)
+			if reportedVersion != versionInImageConfig {
+				if data.Capabilities.BaselineCapabilitySet == configv1.ClusterVersionCapabilitySetCurrent {
+					klog.Infof("The eventual cluster %s will not be the same minor version as this %s 'oc', the actual %s capability set may differ.", versionInImageConfig, reportedVersion, data.Capabilities.BaselineCapabilitySet)
+				} else {
+					klog.Infof("The eventual cluster %s will not be the same minor version as this %s 'oc', the known capability sets may differ.", versionInImageConfig, 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
 	}
 
 	return config, nil
 }
 
-func findClusterIncludeConfig(ctx context.Context, restConfig *rest.Config, reportedVersion string) (manifestInclusionConfiguration, error) {
+func findClusterIncludeConfig(ctx context.Context, restConfig *rest.Config, reportedVersion, versionInImageConfig string) (manifestInclusionConfiguration, error) {
 	config := manifestInclusionConfiguration{}
 
 	client, err := configv1client.NewForConfig(restConfig)
@@ -1338,11 +1340,14 @@ func findClusterIncludeConfig(ctx context.Context, restConfig *rest.Config, repo
 			capSet = capabilitiesSpec.BaselineCapabilitySet
 		}
 		deepCopy := clusterVersion.Status.Capabilities.DeepCopy()
-		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)
+		if reportedVersion != versionInImageConfig {
+			if capSet == configv1.ClusterVersionCapabilitySetCurrent {
+				klog.Infof("The eventual cluster %s will not be the same minor version as this %s 'oc', the actual %s capability set may differ.", versionInImageConfig, reportedVersion, capSet)
+			} else {
+				klog.Infof("The eventual cluster %s will not be the same minor version as this %s 'oc', the known capability sets may differ.", versionInImageConfig, 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
 	}

pkg/cli/image/extract/extract.go

@@ -141,6 +141,8 @@ type ExtractOptions struct {
 
 	genericiooptions.IOStreams
 
+	// ImageConfigCallback is invoked once image config retrieved
+	ImageConfigCallback func(imageConfig *dockerv1client.DockerImageConfig)
 	// ImageMetadataCallback is invoked once per image retrieved, and may be called in parallel if
 	// MaxPerRegistry is set higher than 1.
 	ImageMetadataCallback ImageMetadataFunc
@@ -421,6 +423,9 @@ func (o *ExtractOptions) Run() error {
 				}
 
 				imageConfig, layers, err := imagemanifest.ManifestToImageConfig(ctx, srcManifest, repo.Blobs(ctx), location)
+				if o.ImageConfigCallback != nil {
+					o.ImageConfigCallback(imageConfig)
+				}
 				if err != nil {
 					return fmt.Errorf("unable to parse image %s: %v", from, err)
 				}