Merge pull request #552 from mengqiy/fixsimplecontroller

k8s-ci-robot · web-flow · commit 084b73e5a670 · 2019-08-06T12:54:49.000-07:00
🐛 fix SimpleController in builder test
diff --git a/pkg/builder/controller_test.go b/pkg/builder/controller_test.go
@@ -116,7 +116,12 @@ var _ = Describe("application", func() {
 				}
 				return nil, fmt.Errorf("max concurrent reconcilers expected %d but found %d", maxConcurrentReconciles, options.MaxConcurrentReconciles)
 			}
-			instance, err := SimpleController().
+
+			By("creating a controller manager")
+			m, err := manager.New(cfg, manager.Options{})
+			Expect(err).NotTo(HaveOccurred())
+
+			instance, err := ControllerManagedBy(m).
 				For(&appsv1.ReplicaSet{}).
 				Owns(&appsv1.ReplicaSet{}).
 				WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,12 @@ var _ = Describe("application", func() {`
`116`	`116`	`}`
`117`	`117`	`return nil, fmt.Errorf("max concurrent reconcilers expected %d but found %d", maxConcurrentReconciles, options.MaxConcurrentReconciles)`
`118`	`118`	`}`
`119`		`- instance, err := SimpleController().`
	`119`	`+`
	`120`	`+ By("creating a controller manager")`
	`121`	`+ m, err := manager.New(cfg, manager.Options{})`
	`122`	`+ Expect(err).NotTo(HaveOccurred())`
	`123`	`+`
	`124`	`+ instance, err := ControllerManagedBy(m).`
`120`	`125`	`For(&appsv1.ReplicaSet{}).`
`121`	`126`	`Owns(&appsv1.ReplicaSet{}).`
`122`	`127`	`WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).`