Skip to content

Commit ee6d1f6

Browse files
committed
controller: use OCL specific informer factory
1 parent c5d210a commit ee6d1f6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ verify-e2e: $(patsubst %,_verify-e2e-%,$(E2E_SUITES))
186186

187187
# This was copied from https://github.com/openshift/cluster-image-registry-operator
188188
test-e2e: install-go-junit-report
189-
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 $(@)
189+
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 $(@)
190190

191191
test-e2e-techpreview: install-go-junit-report
192192
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 $(@)

cmd/machine-config-controller/start.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func runStartCmd(_ *cobra.Command, _ []string) {
151151
}
152152

153153
if fg.Enabled(features.FeatureGateOnClusterBuild) {
154-
ctrlctx.TechPreviewInformerFactory.Start(ctrlctx.Stop)
154+
ctrlctx.OCLInformerFactory.Start(ctrlctx.Stop)
155155
}
156156

157157
case <-time.After(1 * time.Minute):
@@ -250,7 +250,7 @@ func createControllers(ctx *ctrlcommon.ControllerContext) []ctrlcommon.Controlle
250250
ctx.InformerFactory.Machineconfiguration().V1().MachineConfigPools(),
251251
ctx.KubeInformerFactory.Core().V1().Nodes(),
252252
ctx.KubeInformerFactory.Core().V1().Pods(),
253-
ctx.InformerFactory.Machineconfiguration().V1().MachineOSConfigs(),
253+
ctx.OCLInformerFactory.Machineconfiguration().V1().MachineOSConfigs(),
254254
ctx.ConfigInformerFactory.Config().V1().Schedulers(),
255255
ctx.ClientBuilder.KubeClientOrDie("node-update-controller"),
256256
ctx.ClientBuilder.MachineConfigClientOrDie("node-update-controller"),

pkg/controller/common/controller_context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type ControllerContext struct {
4949

5050
NamespacedInformerFactory mcfginformers.SharedInformerFactory
5151
InformerFactory mcfginformers.SharedInformerFactory
52-
TechPreviewInformerFactory mcfginformers.SharedInformerFactory
52+
OCLInformerFactory mcfginformers.SharedInformerFactory
5353
KubeInformerFactory informers.SharedInformerFactory
5454
KubeNamespacedInformerFactory informers.SharedInformerFactory
5555
OpenShiftConfigKubeNamespacedInformerFactory informers.SharedInformerFactory
@@ -135,7 +135,7 @@ func CreateControllerContext(ctx context.Context, cb *clients.Builder) *Controll
135135
ClientBuilder: cb,
136136
NamespacedInformerFactory: sharedNamespacedInformers,
137137
InformerFactory: sharedInformers,
138-
TechPreviewInformerFactory: sharedTechPreviewInformers,
138+
OCLInformerFactory: sharedTechPreviewInformers,
139139
KubeInformerFactory: kubeSharedInformer,
140140
KubeNamespacedInformerFactory: kubeNamespacedSharedInformer,
141141
OpenShiftConfigKubeNamespacedInformerFactory: openShiftConfigKubeNamespacedSharedInformer,

0 commit comments

Comments
 (0)