rebase main, fix conflict

Author: richie-king

internal/controller/provisioner/provisioner_test.go

@@ -527,7 +527,9 @@ func TestProvisionerRestartsDeployment(t *testing.T) {
 
 	g.Expect(provisioner.RegisterGateway(t.Context(), gateway, "gw-nginx")).To(Succeed())
 	// not plus
-	expectResourcesToExist(t, g, fakeClient, types.NamespacedName{Name: "gw-nginx", Namespace: "default"}, false)
+	expectResourcesToExist(
+		t, g, fakeClient, types.NamespacedName{Name: "gw-nginx", Namespace: "default"}, false,
+	)
 
 	// update agent config
 	updatedConfig := &graph.Gateway{