Merge pull request #1090 from Prashanth684/importmode-imagestream

MULTIARCH-4971: Sync ImageStreamImportMode setting in the image config status

Author: openshift-merge-bot[bot]

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/gophercloud/utils/v2 v2.0.0-20240807081201-990d90b23c70
 	github.com/goware/urlx v0.3.2
 	github.com/jongio/azidext/go/azidext v0.5.0
-	github.com/openshift/api v0.0.0-20240805090819-b8f07e1d8f62
+	github.com/openshift/api v0.0.0-20240816151955-65532e7f773e
 	github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
 	github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
 	github.com/openshift/library-go v0.0.0-20240709182732-b94141242b0c

go.sum

@@ -944,8 +944,8 @@ github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY
 github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
 github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
 github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
-github.com/openshift/api v0.0.0-20240805090819-b8f07e1d8f62 h1:2jyUqwnmL6DvVOfRz7yv21w3OjzrBe6qg0Ewxf+lIsk=
-github.com/openshift/api v0.0.0-20240805090819-b8f07e1d8f62/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/api v0.0.0-20240816151955-65532e7f773e h1:xypovjFuxCGdcxu2E1WJsBS47ZXyI8wQyEaeHQXrhFY=
+github.com/openshift/api v0.0.0-20240816151955-65532e7f773e/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs=
 github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=

pkg/operator/imageconfig.go

@@ -23,6 +23,7 @@ import (
 	configapi "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	configset "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
+	configv1informers "github.com/openshift/client-go/config/informers/externalversions/config/v1"
 	routev1informers "github.com/openshift/client-go/route/informers/externalversions/route/v1"
 	routev1lister "github.com/openshift/client-go/route/listers/route/v1"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
@@ -36,26 +37,30 @@ import (
 // Watches for changes on image registry routes and services, updating
 // the resource status appropriately.
 type ImageConfigController struct {
-	configClient   configset.ConfigV1Interface
-	operatorClient v1helpers.OperatorClient
-	routeLister    routev1lister.RouteNamespaceLister
-	serviceLister  corev1listers.ServiceNamespaceLister
-	cachesToSync   []cache.InformerSynced
-	queue          workqueue.RateLimitingInterface
+	configClient                 configset.ConfigV1Interface
+	operatorClient               v1helpers.OperatorClient
+	routeLister                  routev1lister.RouteNamespaceLister
+	serviceLister                corev1listers.ServiceNamespaceLister
+	cachesToSync                 []cache.InformerSynced
+	queue                        workqueue.RateLimitingInterface
+	imageStreamImportModeEnabled bool
 }
 
 func NewImageConfigController(
 	configClient configset.ConfigV1Interface,
 	operatorClient v1helpers.OperatorClient,
 	routeInformer routev1informers.RouteInformer,
 	serviceInformer corev1informers.ServiceInformer,
+	imageConfigInformer configv1informers.ImageInformer,
+	imageStreamImportModeEnabled bool,
 ) (*ImageConfigController, error) {
 	icc := &ImageConfigController{
-		configClient:   configClient,
-		operatorClient: operatorClient,
-		routeLister:    routeInformer.Lister().Routes(defaults.ImageRegistryOperatorNamespace),
-		serviceLister:  serviceInformer.Lister().Services(defaults.ImageRegistryOperatorNamespace),
-		queue:          workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ImageConfigController"),
+		configClient:                 configClient,
+		operatorClient:               operatorClient,
+		routeLister:                  routeInformer.Lister().Routes(defaults.ImageRegistryOperatorNamespace),
+		serviceLister:                serviceInformer.Lister().Services(defaults.ImageRegistryOperatorNamespace),
+		queue:                        workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ImageConfigController"),
+		imageStreamImportModeEnabled: imageStreamImportModeEnabled,
 	}
 
 	if _, err := serviceInformer.Informer().AddEventHandler(icc.eventHandler()); err != nil {
@@ -68,6 +73,12 @@ func NewImageConfigController(
 	}
 	icc.cachesToSync = append(icc.cachesToSync, routeInformer.Informer().HasSynced)
 
+	if imageStreamImportModeEnabled {
+		if _, err := imageConfigInformer.Informer().AddEventHandler(icc.eventHandler()); err != nil {
+			return nil, err
+		}
+		icc.cachesToSync = append(icc.cachesToSync, imageConfigInformer.Informer().HasSynced)
+	}
 	return icc, nil
 }
 
@@ -159,6 +170,20 @@ func (icc *ImageConfigController) syncImageStatus() error {
 		cfg.Status.InternalRegistryHostname = internalHostname
 		modified = true
 	}
+	if icc.imageStreamImportModeEnabled {
+		var importmode configapi.ImportModeType
+		if cfg.Spec.ImageStreamImportMode != "" {
+			importmode = cfg.Spec.ImageStreamImportMode
+		} else {
+			// TODO: once clusterversion reports the type of payload in its status, use that to determine what the default will be
+			// i.e, multi payload => PreserveOriginal, single arch payload => Legacy
+			importmode = configapi.ImportModeLegacy
+		}
+		if cfg.Status.ImageStreamImportMode != importmode {
+			cfg.Status.ImageStreamImportMode = importmode
+			modified = true
+		}
+	}
 
 	if modified {
 		if _, err := icc.configClient.Images().UpdateStatus(context.TODO(), cfg, metav1.UpdateOptions{}); err != nil {

pkg/operator/starter.go

@@ -11,6 +11,7 @@ import (
 	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/api/features"
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	imageclient "github.com/openshift/client-go/image/clientset/versioned"
@@ -110,11 +111,19 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
 		return err
 	}
 
+	featureGates, err := featureGateAccessor.CurrentFeatureGates()
+	if err != nil {
+		return err
+	}
+	imageStreamImportModeEnabled := featureGates.Enabled(features.FeatureGateImageStreamImportMode)
+
 	imageConfigStatusController, err := NewImageConfigController(
 		configClient.ConfigV1(),
 		configOperatorClient,
 		routeInformers.Route().V1().Routes(),
 		kubeInformers.Core().V1().Services(),
+		configInformers.Config().V1().Images(),
+		imageStreamImportModeEnabled,
 	)
 	if err != nil {
 		return err