test: fix e2e test error

emqx · Aug 31, 2022 · 37d01a6 · 37d01a6
1 parent ba010ea
commit 37d01a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/apps/v2alpha1/emqx_controller.go b/controllers/apps/v2alpha1/emqx_controller.go
@@ -143,7 +143,7 @@ func (r *EMQXReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	}
 
 	if deploy := generateDeployment(instance); deploy != nil {
-		if instance.Status.IsCoreUpdating() {
+		if instance.Status.IsCoreUpdating() && instance.Status.OriginalImage != "" {
 			deploy.Spec.Template.Spec.Containers[0].Image = instance.Status.OriginalImage
 		}
 		resources = append(resources, deploy)

diff --git a/e2e/v2alpha1/suite_test.go b/e2e/v2alpha1/suite_test.go
@@ -59,7 +59,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	timeout = time.Minute * 7
+	timeout = time.Minute * 5
 	interval = time.Second * 1
 
 	Expect(os.Setenv("USE_EXISTING_CLUSTER", "true")).To(Succeed())