Merge pull request #4838 from djoshy/fix-tech-preview-factory

OCPBUGS-50002: MCC complains about v1 MachineOSConfig in default featureset
openshift · Feb 7, 2025 · 6546cf2 · 6546cf2
2 parents d6ac7f3 + ee6d1f6
commit 6546cf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -186,7 +186,7 @@ verify-e2e: $(patsubst %,_verify-e2e-%,$(E2E_SUITES))
 
 # This was copied from https://github.com/openshift/cluster-image-registry-operator
 test-e2e: install-go-junit-report
-	set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 170m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e/ ./test/e2e-techpreview-shared/ | ./hack/test-with-junit.sh $(@)
+	set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e/ ./test/e2e-techpreview-shared/ | ./hack/test-with-junit.sh $(@)
 
 test-e2e-techpreview: install-go-junit-report
 	set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 170m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-techpreview  ./test/e2e-techpreview-shared/ | ./hack/test-with-junit.sh $(@)

diff --git a/cmd/machine-config-controller/start.go b/cmd/machine-config-controller/start.go
@@ -151,7 +151,7 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 			}
 
 			if fg.Enabled(features.FeatureGateOnClusterBuild) {
-				ctrlctx.TechPreviewInformerFactory.Start(ctrlctx.Stop)
+				ctrlctx.OCLInformerFactory.Start(ctrlctx.Stop)
 			}
 
 		case <-time.After(1 * time.Minute):
@@ -250,7 +250,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().V1().MachineOSConfigs(),
+			ctx.OCLInformerFactory.Machineconfiguration().V1().MachineOSConfigs(),
 			ctx.ConfigInformerFactory.Config().V1().Schedulers(),
 			ctx.ClientBuilder.KubeClientOrDie("node-update-controller"),
 			ctx.ClientBuilder.MachineConfigClientOrDie("node-update-controller"),

diff --git a/pkg/controller/common/controller_context.go b/pkg/controller/common/controller_context.go
@@ -49,7 +49,7 @@ type ControllerContext struct {
 
 	NamespacedInformerFactory                           mcfginformers.SharedInformerFactory
 	InformerFactory                                     mcfginformers.SharedInformerFactory
-	TechPreviewInformerFactory                          mcfginformers.SharedInformerFactory
+	OCLInformerFactory                                  mcfginformers.SharedInformerFactory
 	KubeInformerFactory                                 informers.SharedInformerFactory
 	KubeNamespacedInformerFactory                       informers.SharedInformerFactory
 	OpenShiftConfigKubeNamespacedInformerFactory        informers.SharedInformerFactory
@@ -135,7 +135,7 @@ func CreateControllerContext(ctx context.Context, cb *clients.Builder) *Controll
 		ClientBuilder:                                       cb,
 		NamespacedInformerFactory:                           sharedNamespacedInformers,
 		InformerFactory:                                     sharedInformers,
-		TechPreviewInformerFactory:                          sharedTechPreviewInformers,
+		OCLInformerFactory:                                  sharedTechPreviewInformers,
 		KubeInformerFactory:                                 kubeSharedInformer,
 		KubeNamespacedInformerFactory:                       kubeNamespacedSharedInformer,
 		OpenShiftConfigKubeNamespacedInformerFactory:        openShiftConfigKubeNamespacedSharedInformer,