Skip to content

Commit c442c42

Browse files
efiacorefiacor
authored
Remove use of porch Clientset (#471)
* Remove use of porch Clientset Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> * Remove unused UpdateOptions Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> * Use DeepCopy to avoid Update race Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> * Refactor proposeAndApprovePackage method Refactor package approval process for migration. --------- Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>
1 parent 128382a commit c442c42

14 files changed

Lines changed: 83 additions & 122 deletions

‎test/disaster/api/disaster_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/go-git/go-billy/v5/helper/chroot"
2424
"github.com/go-git/go-git/v5"
2525
"github.com/go-git/go-git/v5/storage/filesystem"
26+
porchapi "github.com/nephio-project/porch/api/porch/v1alpha1"
2627
configapi "github.com/nephio-project/porch/api/porchconfig/v1alpha1"
2728
"github.com/nephio-project/porch/test/disaster/api/environment/gitea"
2829
"github.com/nephio-project/porch/test/disaster/api/environment/kind"
@@ -34,7 +35,6 @@ import (
3435
"github.com/nephio-project/porch/test/e2e/suiteutils"
3536
"github.com/stretchr/testify/suite"
3637
apierrors "k8s.io/apimachinery/pkg/api/errors"
37-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3838
"k8s.io/apimachinery/pkg/util/wait"
3939
"sigs.k8s.io/controller-runtime/pkg/client"
4040
)
@@ -310,8 +310,8 @@ func (t *PorchDisasterRecoverySuite) TestPorchPodsUngracefulRestart() {
310310
t.WaitUntilMultipleRepositoriesReady(repos.Items)
311311

312312
wait.PollUntilContextTimeout(t.GetContext(), time.Second, 60*time.Second, true, func(ctx context.Context) (bool, error) {
313-
_, err := t.Clientset.PorchV1alpha1().PackageRevisions(t.Namespace).
314-
List(t.GetContext(), metav1.ListOptions{FieldSelector: "spec.repository=" + repos.Items[0].Name})
313+
var prList porchapi.PackageRevisionList
314+
err := t.Reader.List(ctx, &prList, client.InNamespace(t.Namespace), client.MatchingFields{"spec.repository": repos.Items[0].Name})
315315
if err != nil {
316316
if apierrors.IsTimeout(err) {
317317
return false, nil

‎test/e2e/api/advanced_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,12 @@ func (t *PorchSuite) TestCreatePackageRevisionRollback() {
265265
}
266266

267267
// Attempt to create the package revision
268-
_, err := t.Clientset.PorchV1alpha1().PackageRevisions(t.Namespace).Create(ctx, pr, metav1.CreateOptions{})
268+
err := t.Client.Create(ctx, pr)
269269
assert.Error(t, err, "Expected error when creating package revision with invalid task configuration")
270270

271271
// Verify that the package revision was not created
272-
_, err = t.Clientset.PorchV1alpha1().PackageRevisions(t.Namespace).Get(ctx, pr.Name, metav1.GetOptions{})
272+
var checkPr porchapi.PackageRevision
273+
err = t.Reader.Get(ctx, client.ObjectKey{Namespace: t.Namespace, Name: pr.Name}, &checkPr)
273274
assert.True(t, errors.IsNotFound(err), "Expected package revision to be deleted after rollback")
274275
}
275276

@@ -296,7 +297,7 @@ func (t *PorchSuite) TestMetadataAfterApproveAndBackgroundJob() {
296297
t.UpdateF(pr)
297298
t.GetF(prKey, pr)
298299
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
299-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
300+
t.UpdateApprovalF(pr)
300301
t.GetF(prKey, pr)
301302

302303
// List package revisions and check they are as expected
@@ -341,7 +342,7 @@ func (t *PorchSuite) TestMetadataAfterDeleteAndBackgroundJob() {
341342
t.UpdateF(pr)
342343
t.GetF(prKey, pr)
343344
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
344-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
345+
t.UpdateApprovalF(pr)
345346
t.GetF(prKey, pr)
346347

347348
// List package revisions and check they are as expected
@@ -359,7 +360,7 @@ func (t *PorchSuite) TestMetadataAfterDeleteAndBackgroundJob() {
359360
//
360361
// (henceforth called "the v1 package revision")
361362
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
362-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
363+
t.UpdateApprovalF(pr)
363364
t.DeleteE(&porchapi.PackageRevision{
364365
ObjectMeta: metav1.ObjectMeta{
365366
Namespace: t.Namespace,

‎test/e2e/api/concurrent_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (t *PorchSuite) TestConcurrentResourceUpdates() {
179179

180180
// "Update" the package resources with two clients at the same time
181181
updateFunction := func() any {
182-
return t.Client.Update(t.GetContext(), &newPackageResources)
182+
return t.Client.Update(t.GetContext(), newPackageResources.DeepCopy())
183183
}
184184
results := suiteutils.RunInParallel(updateFunction, updateFunction)
185185
t.assertConcurrentResults(results, "resource update")
@@ -207,7 +207,7 @@ func (t *PorchSuite) TestConcurrentProposeApprove() {
207207
// Propose the package revision to be finalized
208208
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
209209
proposeFunction := func() any {
210-
return t.Client.Update(t.GetContext(), &pkg)
210+
return t.Client.Update(t.GetContext(), pkg.DeepCopy())
211211
}
212212
proposeResults := suiteutils.RunInParallel(proposeFunction, proposeFunction)
213213
t.assertConcurrentResults(proposeResults, "propose")
@@ -221,8 +221,7 @@ func (t *PorchSuite) TestConcurrentProposeApprove() {
221221
// Approve the package
222222
proposed.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
223223
approveFunction := func() any {
224-
_, err := t.Clientset.PorchV1alpha1().PackageRevisions(proposed.Namespace).UpdateApproval(t.GetContext(), proposed.Name, &proposed, metav1.UpdateOptions{})
225-
return err
224+
return t.UpdateApprovalE(&proposed)
226225
}
227226
approveResults := suiteutils.RunInParallel(approveFunction, approveFunction)
228227
t.assertConcurrentResults(approveResults, "approve")
@@ -290,8 +289,7 @@ func (t *PorchSuite) TestConcurrentProposeDeletes() {
290289
// Propose deletion with two clients at once
291290
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
292291
proposeDeleteFunction := func() any {
293-
_, err := t.Clientset.PorchV1alpha1().PackageRevisions(pkg.Namespace).UpdateApproval(t.GetContext(), pkg.Name, &pkg, metav1.UpdateOptions{})
294-
return err
292+
return t.UpdateApprovalE(&pkg)
295293
}
296294
proposeDeleteResults := suiteutils.RunInParallel(proposeDeleteFunction, proposeDeleteFunction)
297295
t.assertConcurrentResults(proposeDeleteResults, "propose-delete")
@@ -336,7 +334,7 @@ func (t *PorchSuite) TestConcurrentPackageUpdates() {
336334

337335
// Two clients at the same time try to update the downstream package
338336
updateFunction := func() any {
339-
return t.Client.Update(t.GetContext(), pr)
337+
return t.Client.Update(t.GetContext(), pr.DeepCopy())
340338
}
341339
results := suiteutils.RunInParallel(updateFunction, updateFunction)
342340
t.assertConcurrentResults(results, "package update")
@@ -355,5 +353,5 @@ func (t *PorchSuite) proposeAndApprovePackage(pr *porchapi.PackageRevision) {
355353
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
356354
t.UpdateF(pr)
357355
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
358-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
356+
t.UpdateApprovalF(pr)
359357
}

‎test/e2e/api/repository_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (t *PorchSuite) TestGitRepositoryWithReleaseTagsAndDirectory() {
8383
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
8484
t.UpdateF(pr)
8585
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
86-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
86+
t.UpdateApprovalF(pr)
8787

8888
// Unregister and re-register the same repo to mock an exisiting repo
8989
// which contains a release tag and a directory

‎test/e2e/api/rpkg_clone_test.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/nephio-project/porch/pkg/repository"
2222
suiteutils "github.com/nephio-project/porch/test/e2e/suiteutils"
2323
corev1 "k8s.io/api/core/v1"
24-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2524
"sigs.k8s.io/controller-runtime/pkg/client"
2625
)
2726

@@ -210,12 +209,11 @@ data:
210209
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
211210
t.UpdateF(pr)
212211
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
213-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
212+
published := t.UpdateApprovalF(pr)
214213

215-
// upgrade "test-workspace" to basensV2
216-
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDraft
217-
pr.Spec.WorkspaceName = testWorkspace + "-upgrade"
218-
pr.Spec.Tasks = []porchapi.Task{{
214+
// Create new PackageRevision for upgrade workspace
215+
upgradePr := t.CreatePackageSkeleton(gitRepository, "testns", testWorkspace+"-upgrade")
216+
upgradePr.Spec.Tasks = []porchapi.Task{{
219217
Type: porchapi.TaskTypeUpgrade,
220218
Upgrade: &porchapi.PackageUpgradeTaskSpec{
221219
OldUpstream: porchapi.PackageRevisionRef{
@@ -225,16 +223,15 @@ data:
225223
Name: basensV2.Name,
226224
},
227225
LocalPackageRevisionRef: porchapi.PackageRevisionRef{
228-
Name: pr.Name, // this is still the name of the "test-workspace" PR
226+
Name: published.Name,
229227
},
230228
},
231229
}}
232-
233-
t.CreateF(pr)
230+
t.CreateF(upgradePr)
234231

235232
t.GetF(client.ObjectKey{
236233
Namespace: t.Namespace,
237-
Name: pr.Name,
234+
Name: upgradePr.Name,
238235
}, &revisionResources)
239236

240237
if _, found := revisionResources.Spec.Resources["resourcequota.yaml"]; !found {

‎test/e2e/api/rpkg_edit_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
porchapi "github.com/nephio-project/porch/api/porch/v1alpha1"
2020
suiteutils "github.com/nephio-project/porch/test/e2e/suiteutils"
2121
"github.com/stretchr/testify/assert"
22-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2322
"sigs.k8s.io/controller-runtime/pkg/client"
2423
)
2524

@@ -82,7 +81,7 @@ func (t *PorchSuite) TestEditPackageRevision() {
8281

8382
// Approve the package
8483
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
85-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
84+
t.UpdateApprovalF(pr)
8685

8786
// Changing the workspace of the EditPR to avoid clashing with invalid create negative test above
8887
editPR.Spec.WorkspaceName = workspaceToAvoidCreationClash

‎test/e2e/api/rpkg_lifecycle_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (t *PorchSuite) runLifecycleTest(tc LifecycleTestCase) {
116116
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
117117
t.UpdateF(pr)
118118
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
119-
pr = t.UpdateApprovalF(pr, metav1.UpdateOptions{})
119+
pr = t.UpdateApprovalF(pr)
120120
case porchapi.PackageRevisionLifecycleProposed:
121121
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
122122
t.UpdateF(pr)
@@ -133,7 +133,7 @@ func (t *PorchSuite) runLifecycleTest(tc LifecycleTestCase) {
133133
if tc.ShouldDelete {
134134
if tc.TargetState == porchapi.PackageRevisionLifecyclePublished {
135135
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
136-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
136+
t.UpdateApprovalF(pr)
137137
}
138138
t.DeleteE(&porchapi.PackageRevision{
139139
ObjectMeta: metav1.ObjectMeta{
@@ -167,7 +167,7 @@ func (t *PorchSuite) TestProposeDeleteAndUndo() {
167167
t.UpdateF(&pkg)
168168

169169
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
170-
t.UpdateApprovalF(&pkg, metav1.UpdateOptions{})
170+
t.UpdateApprovalF(&pkg)
171171
t.MustExist(client.ObjectKey{Namespace: t.Namespace, Name: created.Name}, &pkg)
172172

173173
_ = t.WaitUntilPackageRevisionExists(repository, packageName, -1)
@@ -180,11 +180,11 @@ func (t *PorchSuite) TestProposeDeleteAndUndo() {
180180
t.Run(fmt.Sprintf("revision %d", pkgRev.Spec.Revision), func() {
181181
// Propose deletion
182182
pkgRev.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
183-
pkgRev = *t.UpdateApprovalF(&pkgRev, metav1.UpdateOptions{})
183+
pkgRev = *t.UpdateApprovalF(&pkgRev)
184184

185185
// Undo proposal of deletion
186186
pkgRev.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
187-
pkgRev = *t.UpdateApprovalF(&pkgRev, metav1.UpdateOptions{})
187+
pkgRev = *t.UpdateApprovalF(&pkgRev)
188188

189189
// Try to delete the package. This should fail because the lifecycle should be changed back to Published.
190190
t.DeleteL(&porchapi.PackageRevision{
@@ -197,7 +197,7 @@ func (t *PorchSuite) TestProposeDeleteAndUndo() {
197197

198198
// Propose deletion and then delete the package
199199
pkgRev.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
200-
pkgRev = *t.UpdateApprovalF(&pkgRev, metav1.UpdateOptions{})
200+
pkgRev = *t.UpdateApprovalF(&pkgRev)
201201

202202
t.DeleteE(&porchapi.PackageRevision{
203203
ObjectMeta: metav1.ObjectMeta{
@@ -235,15 +235,15 @@ func (t *PorchSuite) TestDeleteAndRecreate() {
235235

236236
t.Log("Approve the package revision to be finalized")
237237
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
238-
t.UpdateApprovalF(&pkg, metav1.UpdateOptions{})
238+
t.UpdateApprovalF(&pkg)
239239

240240
t.MustExist(client.ObjectKey{Namespace: t.Namespace, Name: created.Name}, &pkg)
241241

242242
mainPkg := t.WaitUntilPackageRevisionExists(repository, packageName, -1)
243243

244244
t.Log("Propose deletion and then delete the package with revision v1")
245245
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
246-
t.UpdateApprovalF(&pkg, metav1.UpdateOptions{})
246+
t.UpdateApprovalF(&pkg)
247247

248248
t.DeleteE(&porchapi.PackageRevision{
249249
ObjectMeta: metav1.ObjectMeta{
@@ -255,7 +255,7 @@ func (t *PorchSuite) TestDeleteAndRecreate() {
255255

256256
t.Log("Propose deletion and then delete the package with revision main")
257257
mainPkg.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
258-
t.UpdateApprovalF(mainPkg, metav1.UpdateOptions{})
258+
t.UpdateApprovalF(mainPkg)
259259

260260
t.DeleteE(&porchapi.PackageRevision{
261261
ObjectMeta: metav1.ObjectMeta{
@@ -307,7 +307,7 @@ func (t *PorchSuite) TestDeleteFromMain() {
307307
t.UpdateF(&pkgFirst)
308308

309309
pkgFirst.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
310-
t.UpdateApprovalF(&pkgFirst, metav1.UpdateOptions{})
310+
t.UpdateApprovalF(&pkgFirst)
311311

312312
t.MustExist(client.ObjectKey{Namespace: t.Namespace, Name: createdFirst.Name}, &pkgFirst)
313313

@@ -323,7 +323,7 @@ func (t *PorchSuite) TestDeleteFromMain() {
323323
t.UpdateF(&pkgSecond)
324324

325325
pkgSecond.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
326-
t.UpdateApprovalF(&pkgSecond, metav1.UpdateOptions{})
326+
t.UpdateApprovalF(&pkgSecond)
327327

328328
t.MustExist(client.ObjectKey{Namespace: t.Namespace, Name: createdSecond.Name}, &pkgSecond)
329329

@@ -333,9 +333,9 @@ func (t *PorchSuite) TestDeleteFromMain() {
333333

334334
t.Log("Propose deletion of both main packages")
335335
firstPkgRevFromMain.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
336-
t.UpdateApprovalF(firstPkgRevFromMain, metav1.UpdateOptions{})
336+
t.UpdateApprovalF(firstPkgRevFromMain)
337337
secondPkgRevFromMain.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
338-
t.UpdateApprovalF(secondPkgRevFromMain, metav1.UpdateOptions{})
338+
t.UpdateApprovalF(secondPkgRevFromMain)
339339

340340
t.Log("Delete the first package revision from main")
341341
t.DeleteE(&porchapi.PackageRevision{
@@ -359,7 +359,7 @@ func (t *PorchSuite) TestDeleteFromMain() {
359359
for _, pkgrev := range list.Items {
360360
t.Logf("Propose deletion and delete package revision: %s", pkgrev.Name)
361361
pkgrev.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
362-
t.UpdateApprovalF(&pkgrev, metav1.UpdateOptions{})
362+
t.UpdateApprovalF(&pkgrev)
363363
t.DeleteE(&porchapi.PackageRevision{
364364
ObjectMeta: metav1.ObjectMeta{
365365
Namespace: t.Namespace,
@@ -549,5 +549,5 @@ func (t *PorchSuite) proposeAndPublish(pkg *porchapi.PackageRevision) *porchapi.
549549
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
550550
t.UpdateF(pkg)
551551
pkg.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
552-
return t.UpdateApprovalF(pkg, metav1.UpdateOptions{})
552+
return t.UpdateApprovalF(pkg)
553553
}

‎test/e2e/api/rpkg_metadata_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ func (t *PorchSuite) TestPackageRevisionMetadata() {
8383

8484
t.ValidateLabelsAndAnnos(pr.Name, map[string]string{"kpt.dev/label": "foo"}, map[string]string{"kpt.dev/anno": "foo", "kpt.dev/other-anno": "bar"})
8585
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
86-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
87-
86+
t.UpdateApprovalF(pr)
87+
8888
t.ValidateLabelsAndAnnos(pr.Name, map[string]string{"kpt.dev/label": "foo", porchapi.LatestPackageRevisionKey: porchapi.LatestPackageRevisionValue}, map[string]string{"kpt.dev/anno": "foo", "kpt.dev/other-anno": "bar"})
8989
t.GetF(client.ObjectKey{Namespace: pr.Namespace, Name: pr.Name}, pr)
9090
delete(pr.Labels, "kpt.dev/label")
@@ -355,7 +355,7 @@ func (t *PorchSuite) TestPackageRevisionLabelSelectors() {
355355
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleProposed
356356
t.UpdateF(&pr)
357357
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
358-
t.UpdateApprovalF(&pr, metav1.UpdateOptions{})
358+
t.UpdateApprovalF(&pr)
359359

360360
cases := []LabelSelectorTestCase{
361361
{

‎test/e2e/performance/iterative_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (t *IterativeTest) ensureTestPackagesDeleted() {
193193
t.ListE(list, client.InNamespace(t.Namespace), client.MatchingFields{"spec.packageName": testPackageName})
194194
for _, pr := range list.Items {
195195
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
196-
t.UpdateApprovalL(&pr, metav1.UpdateOptions{})
196+
t.UpdateApprovalL(&pr)
197197
t.DeleteL(&pr)
198198
}
199199
}
@@ -253,12 +253,12 @@ func (t *IterativeTest) collectMetrics() *IterationMetricsData {
253253
output.GetAfterPropose = Measure(func() { t.GetF(client.ObjectKey{Namespace: t.Namespace, Name: pr.Name}, pr) })
254254

255255
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
256-
output.Approve = Measure(func() { t.UpdateApprovalF(pr, metav1.UpdateOptions{}) })
256+
output.Approve = Measure(func() { t.UpdateApprovalF(pr) })
257257

258258
output.GetAfterPublish = Measure(func() { t.GetF(client.ObjectKey{Namespace: t.Namespace, Name: pr.Name}, pr) })
259259

260260
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
261-
output.DeleteProposed = Measure(func() { t.UpdateApprovalF(pr, metav1.UpdateOptions{}) })
261+
output.DeleteProposed = Measure(func() { t.UpdateApprovalF(pr) })
262262

263263
output.GetAfterProposeDelete = Measure(func() { t.GetF(client.ObjectKey{Namespace: t.Namespace, Name: pr.Name}, pr) })
264264

@@ -291,7 +291,7 @@ func (t *IterativeTest) deletePackageRevisions() {
291291
t.ListE(prs, client.MatchingFields{"spec.repository": repo})
292292
for _, pr := range prs.Items {
293293
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecycleDeletionProposed
294-
t.UpdateApprovalL(&pr, metav1.UpdateOptions{})
294+
t.UpdateApprovalL(&pr)
295295
t.DeleteL(&pr)
296296
}
297297
}()
@@ -324,7 +324,7 @@ func (t *IterativeTest) publishPackageRevision(pr *porchapi.PackageRevision) {
324324
t.UpdateF(pr)
325325

326326
pr.Spec.Lifecycle = porchapi.PackageRevisionLifecyclePublished
327-
t.UpdateApprovalF(pr, metav1.UpdateOptions{})
327+
t.UpdateApprovalF(pr)
328328
}
329329

330330
// printResults prints all the gathered metrics to the log

0 commit comments

Comments
 (0)