openshift · cdoern · Feb 21, 2024
diff --git a/cmd/machine-config-controller/start.go b/cmd/machine-config-controller/start.go
@@ -195,6 +195,7 @@ func createControllers(ctx *ctrlcommon.ControllerContext) []ctrlcommon.Controlle
 			ctx.InformerFactory.Machineconfiguration().V1().MachineConfigPools(),
 			ctx.KubeInformerFactory.Core().V1().Nodes(),
 			ctx.KubeInformerFactory.Core().V1().Pods(),
+			ctx.InformerFactory.Machineconfiguration().V1alpha1().MachineOSBuilds(),
 			ctx.ConfigInformerFactory.Config().V1().Schedulers(),
 			ctx.ClientBuilder.KubeClientOrDie("node-update-controller"),
 			ctx.ClientBuilder.MachineConfigClientOrDie("node-update-controller"),

diff --git a/cmd/machine-os-builder/start.go b/cmd/machine-os-builder/start.go
@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"os"
 
+	mcfgv1alpha1 "github.com/openshift/api/machineconfiguration/v1alpha1"
+
 	"github.com/openshift/machine-config-operator/internal/clients"
 	"github.com/openshift/machine-config-operator/pkg/controller/build"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
@@ -37,6 +39,12 @@ func init() {
 	startCmd.PersistentFlags().StringVar(&startOpts.kubeconfig, "kubeconfig", "", "Kubeconfig file to access a remote cluster (testing only)")
 }
 
+func getMachineOSConfigs(ctx context.Context, cb *clients.Builder) (*mcfgv1alpha1.MachineOSConfigList, error) {
+	mcfgClient := cb.MachineConfigClientOrDie(componentName)
+	return mcfgClient.MachineconfigurationV1alpha1().MachineOSConfigs().List(ctx, metav1.ListOptions{})
+
+}
+
 // Checks if the on-cluster-build-config ConfigMap exists. If it exists, return the ConfigMap.
 // If not, return an error.
 func getBuildControllerConfigMap(ctx context.Context, cb *clients.Builder) (*corev1.ConfigMap, error) {
@@ -57,13 +65,8 @@ func getBuildControllerConfigMap(ctx context.Context, cb *clients.Builder) (*cor
 
 // Creates a new BuildController configured for a certain image builder based
 // upon the imageBuilderType key in the on-cluster-build-config ConfigMap.
-func getBuildController(ctx context.Context, cb *clients.Builder) (*build.Controller, error) {
-	onClusterBuildConfigMap, err := getBuildControllerConfigMap(ctx, cb)
-	if err != nil {
-		return nil, err
-	}
-
-	imageBuilderType, err := build.GetImageBuilderType(onClusterBuildConfigMap)
+func getBuildController(ctx context.Context, cb *clients.Builder) ([]*build.Controller, error) {
+	machineOSConfigs, err := getMachineOSConfigs(ctx, cb)
 	if err != nil {
 		return nil, err
 	}
@@ -72,11 +75,12 @@ func getBuildController(ctx context.Context, cb *clients.Builder) (*build.Contro
 	buildClients := build.NewClientsFromControllerContext(ctrlCtx)
 	cfg := build.DefaultBuildControllerConfig()
 
-	if imageBuilderType == build.OpenshiftImageBuilder {
-		return build.NewWithImageBuilder(cfg, buildClients), nil
-	}
+	controllersToStart := []*build.Controller{}
 
-	return build.NewWithCustomPodBuilder(cfg, buildClients), nil
+	for range machineOSConfigs.Items {
+		controllersToStart = append(controllersToStart, build.NewWithCustomPodBuilder(cfg, buildClients))
+	}
+	return controllersToStart, nil
 }
 
 func runStartCmd(_ *cobra.Command, _ []string) {
@@ -90,13 +94,12 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 	klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
 
 	ctx, cancel := context.WithCancel(context.Background())
-
 	cb, err := clients.NewBuilder("")
 	if err != nil {
 		klog.Fatalln(err)
 	}
 
-	ctrl, err := getBuildController(ctx, cb)
+	controllers, err := getBuildController(ctx, cb)
 	if err != nil {
 		klog.Fatalln(err)
 		var invalidImageBuiler *build.ErrInvalidImageBuilder
@@ -107,7 +110,14 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 		}
 	}
 
-	go ctrl.Run(ctx, 5)
-	<-ctx.Done()
+	// is this... allowed?
+	// since users can specify different settings per pool, we need to run a controller PER pool. Otherwise, settings will be conflated, as will failures and builds.
+	for _, ctrl := range controllers {
+		go ctrl.Run(ctx, 3)
+		<-ctx.Done()
+		cancel()
+	}
+
 	cancel()
+
 }
diff --git a/go.mod b/go.mod
@@ -27,8 +27,8 @@ require (
 	github.com/google/renameio v0.1.0
 	github.com/imdario/mergo v0.3.13
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7
-	github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d
+	github.com/openshift/api v0.0.0-20240410141538-3c0461467316
+	github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae
 	github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe
 	github.com/openshift/library-go v0.0.0-20240312152318-4109a9e7a437
 	github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b

diff --git a/go.sum b/go.sum
@@ -689,10 +689,10 @@ github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQB
 github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
 github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
 github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7 h1:1kHXNv0RGzIF/xaKFK0ZzIdXG6JMsH0YtgCCvP4XykA=
-github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d h1:vdrC3QYkFcs6a1Cz2/p5RcV7dMQ22tbgIonx+8HIJc0=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d/go.mod h1:Y5Hp789dTrF6Fq8cA5YQlpwffmlLy8mc2un/CY0cg7Q=
+github.com/openshift/api v0.0.0-20240410141538-3c0461467316 h1:YfatsH1e28WTbuNUl3LZl6PKCr6zBaYLR7JSxg+LJSU=
+github.com/openshift/api v0.0.0-20240410141538-3c0461467316/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae h1:WzEMf853apLG0ZgkfmKvYXBKBqhzx7nalP306yQP1ck=
+github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae/go.mod h1:YOfx7b9ieudQJImuo95BcVzifosCrCGBErbO/w/njBU=
 github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe h1:wDQtyIbJJIoif2Ux0S+9MJWIWEGV0oG+iLm8WtqwdSw=
 github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe/go.mod h1:SGUtv1pKZSzSVr2YCxXFvhE+LbGfI+vcetEhNicKayw=
 github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0 h1:GPlAy197Jkr+D0T2FNWanamraTdzS/r9ZkT29lxvHaA=

diff --git a/hack/crds-sync.sh b/hack/crds-sync.sh
@@ -3,12 +3,14 @@
 set -euo pipefail
 
 # map names of CRD files between the vendored openshift/api repository and the ./install directory
-CRDS_MAPPING=( "v1/0000_80_containerruntimeconfig.crd.yaml:0000_80_machine-config-operator_01_containerruntimeconfig.crd.yaml"
-               "v1/0000_80_kubeletconfig.crd.yaml:0000_80_machine-config-operator_01_kubeletconfig.crd.yaml"
-               "v1/0000_80_machineconfig.crd.yaml:0000_80_machine-config-operator_01_machineconfig.crd.yaml"
-               "v1/0000_80_machineconfigpool.crd.yaml:0000_80_machine-config-operator_01_machineconfigpool.crd.yaml"
-               "v1alpha1/0000_80_machineconfignode-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config-operator_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" ) 
-                #TODO(jkyros): 0000_80_machine-config-operator_02_containerruntimeconfig.crd.yaml)
+CRDS_MAPPING=( "v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml:0000_80_machine-config_01_containerruntimeconfig.crd.yaml"
+               "v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml:0000_80_machine-config_01_kubeletconfig.crd.yaml"
+               "v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigs.crd.yaml:0000_80_machine-config_01_machineconfig.crd.yaml"
+               "v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Default.crd.yaml:0000_80_machine-config_01_machineconfigpool.crd.yaml"
+               "v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml"
+                "v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineosbuilds-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config_01_machineosbuild-TechPreviewNoUpgrade.crd.yaml"
+                "v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineosconfigs-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config_01_machineosconfig-TechPreviewNoUpgrade.crd.yaml") 
+                #TODO(jkyros): 0000_80_machine-config_01_machine-config-operator_02_containerruntimeconfig.crd.yaml)
 
 for crd in "${CRDS_MAPPING[@]}" ; do
     SRC="${crd%%:*}"
@@ -17,7 +19,14 @@ for crd in "${CRDS_MAPPING[@]}" ; do
 done
 
 #this one goes in manifests rather than install, but should it? 
-cp "vendor/github.com/openshift/api/config/v1alpha1/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml" "install/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml"
-cp "vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml" "manifests/controllerconfig.crd.yaml"
-cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/0000_80_machineconfignode-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config-operator_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" 
-cp "vendor/github.com/openshift/api/operator/v1/0000_80_machine-config-operator_01_config.crd.yaml" "install/0000_80_machine-config-operator_01_config.crd.yaml"
+cp "vendor/github.com/openshift/api/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies-TechPreviewNoUpgrade.crd.yaml" "install/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml" "manifests/controllerconfig.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" 
+#cp "vendor/github.com/openshift/api/operator/v1/0000_80_machine-config-operator_01_config.crd.yaml" "install/0000_80_machine-config-operator_01_config.crd.yaml" 
+cp "vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations-Default.crd.yaml" "install/0000_80_machine-config_01_config.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineosbuilds-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_machineosbuild-TechPreviewNoUpgrade.crd.yaml" 
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineosconfigs-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_machineosconfig-TechPreviewNoUpgrade.crd.yaml" 
+
+
+
+
diff --git a/install/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml b/install/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml
@@ -3,9 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1457
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/feature-set: TechPreviewNoUpgrade
   name: clusterimagepolicies.config.openshift.io
 spec:

diff --git a/install/0000_80_machine-config-operator_00_clusterreader_clusterrole.yaml b/install/0000_80_machine-config-operator_00_clusterreader_clusterrole.yaml
@@ -56,3 +56,23 @@ rules:
       - get
       - list
       - watch
+  - apiGroups: 
+      - machineconfiguration.openshift.io
+    resources: 
+      - machineosconfigs 
+      - machineosconfigs/status
+    verbs: 
+      - create
+      - update 
+      - patch 
+      - get
+  - apiGroups: 
+      - machineconfiguration.openshift.io
+    resources: 
+      - machineosbuilds
+      - machineosbuilds/status
+    verbs: 
+      - create
+      - update 
+      - patch
+      - get