add InternalReleaseImage controller

This controller takes care of the IRI deletion, and it avoids any machine config drifting - by generating or updating the IRI owned machine config

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,20 @@ 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.InformerFactory.Machineconfiguration().V1().ControllerConfigs(),
+				ctrlctx.InformerFactory.Machineconfiguration().V1().MachineConfigs(),
+				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"),

install/image-references

@@ -44,3 +44,7 @@ spec:
     from:
       kind: DockerImage
       name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:baremetal-runtimecfg
+  - name: docker-registry
+    from:
+      kind: DockerImage
+      name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:docker-registry

pkg/controller/bootstrap/bootstrap.go

@@ -258,8 +258,8 @@ func (b *Bootstrap) Run(destDir string) error {
 				return err
 			}
 			configs = append(configs, iriConfig)
+			klog.Infof("Successfully generated MachineConfig from InternalReleaseImage.")
 		}
-		klog.Infof("Successfully generated MachineConfig from InternalReleaseImage.")
 	}
 
 	// Create component MachineConfigs for pre-built images for hybrid OCL

pkg/controller/internalreleaseimage/internalreleaseimage_bootstrap_test.go

@@ -13,7 +13,7 @@ func TestRunInternalReleaseImageBootstrap(t *testing.T) {
 	cc := &mcfgv1.ControllerConfig{
 		Spec: mcfgv1.ControllerConfigSpec{
 			Images: map[string]string{
-				templatectrl.DockerRegistryKey: "docker-image-pullspec",
+				templatectrl.DockerRegistryKey: "docker-registry-image-pullspec",
 			},
 		},
 	}
@@ -23,5 +23,5 @@ func TestRunInternalReleaseImageBootstrap(t *testing.T) {
 	assert.Equal(t, mc.Name, iriMachineConfigName)
 	assert.Equal(t, mc.Labels[mcfgv1.MachineConfigRoleLabelKey], "master")
 	assert.Equal(t, mc.OwnerReferences[0].Kind, "InternalReleaseImage")
-	assert.Contains(t, string(mc.Spec.Config.Raw), "docker-image-pullspec")
+	assert.Contains(t, string(mc.Spec.Config.Raw), "docker-registry-image-pullspec")
 }