added iri controller

Author: andfasano

cmd/machine-config-controller/start.go

@@ -13,6 +13,7 @@ import (
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	containerruntimeconfig "github.com/openshift/machine-config-operator/pkg/controller/container-runtime-config"
 	"github.com/openshift/machine-config-operator/pkg/controller/drain"
+	"github.com/openshift/machine-config-operator/pkg/controller/internalreleaseimage"
 	kubeletconfig "github.com/openshift/machine-config-operator/pkg/controller/kubelet-config"
 	machinesetbootimage "github.com/openshift/machine-config-operator/pkg/controller/machine-set-boot-image"
 	"github.com/openshift/machine-config-operator/pkg/controller/node"
@@ -128,6 +129,18 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 			ctrlctx.InformerFactory.Start(ctrlctx.Stop)
 		}
 
+		if ctrlctx.FeatureGatesHandler.Enabled(features.FeatureGateNoRegistryClusterInstall) {
+			iriController := internalreleaseimage.New(
+				ctrlctx.InformerFactory.Machineconfiguration().V1alpha1().InternalReleaseImages(),
+				ctrlctx.ClientBuilder.KubeClientOrDie("internalreleaseimage-controller"),
+				ctrlctx.ClientBuilder.MachineConfigClientOrDie("internalreleaseimage-controller"))
+
+			go iriController.Run(2, ctrlctx.Stop)
+			// start the informers again to enable feature gated types.
+			// see comments in SharedInformerFactory interface.
+			ctrlctx.InformerFactory.Start(ctrlctx.Stop)
+		}
+
 		if ctrlcommon.IsBootImageControllerRequired(ctrlctx) {
 			machineSetBootImage := machinesetbootimage.New(
 				ctrlctx.ClientBuilder.KubeClientOrDie("machine-set-boot-image-controller"),

pkg/controller/bootstrap/bootstrap.go

@@ -253,13 +253,13 @@ func (b *Bootstrap) Run(destDir string) error {
 
 	if fgHandler != nil && fgHandler.Enabled(features.FeatureGateNoRegistryClusterInstall) {
 		if iri != nil {
-			iriConfigs, err := internalreleaseimage.RunInternalReleaseImageBootstrap(cconfig)
+			iriConfig, err := internalreleaseimage.RunInternalReleaseImageBootstrap(iri)
 			if err != nil {
 				return err
 			}
-			configs = append(configs, iriConfigs...)
+			configs = append(configs, iriConfig)
 		}
-		klog.Infof("Successfully generated MachineConfigs from InternalReleaseImage.")
+		klog.Infof("Successfully generated MachineConfig from InternalReleaseImage.")
 	}
 
 	// Create component MachineConfigs for pre-built images for hybrid OCL

pkg/controller/internalreleaseimage/internalreleaseimage_bootstrap.go

@@ -2,9 +2,10 @@ package internalreleaseimage
 
 import (
 	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
+	mcfgv1alpha1 "github.com/openshift/api/machineconfiguration/v1alpha1"
 )
 
 // RunInternalReleaseImageBootstrap generates a MachineConfig object for InternalReleaseImage that would have been generated by syncInternalReleaseImage
-func RunInternalReleaseImageBootstrap(controllerConfig *mcfgv1.ControllerConfig) ([]*mcfgv1.MachineConfig, error) {
-	return generateInternalReleaseImageMachineConfig(controllerConfig)
+func RunInternalReleaseImageBootstrap(iri *mcfgv1alpha1.InternalReleaseImage) (*mcfgv1.MachineConfig, error) {
+	return generateInternalReleaseImageMachineConfig(iri)
 }