search

cert-manager / trust-manager

trust-manager is an operator for distributing trust bundles across a Kubernetes cluster.
https://cert-manager.io/docs/projects/trust-manager/
Apache License 2.0
243 stars 65 forks source link

test: fix flaky tests by introducing komega #252

Closed erikgb closed 8 months ago

erikgb commented 8 months ago

This change will hopefully fix the flaky integration tests that have been annoying me in several PRs. I like Ginkgo/Gomega, but I know the maintainers are not big fans. 😁 But as long as we are using Ginkgo/Gomega, I think komega (part of controller-runtime) makes the code more compact and avoids attempts on outdated test resource updates.

/cc @inteon @SgtCoDFish

inteon commented 8 months ago

/test pull-trust-manager-smoke

jetstack-bot commented 8 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SgtCoDFish

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/cert-manager/trust-manager/blob/main/OWNERS)~~ [SgtCoDFish] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
erikgb commented 7 months ago

/cherrypick release-0.7

Required to cherry-pick https://github.com/cert-manager/trust-manager/pull/260.

jetstack-bot commented 7 months ago

@erikgb: #252 failed to apply on top of branch "release-0.7":

Applying: test: fix flaky tests by introducing komega
Using index info to reconstruct a base tree...
M   test/integration/bundle/suite.go
Falling back to patching base and 3-way merge...
Auto-merging test/integration/bundle/suite.go
CONFLICT (content): Merge conflict in test/integration/bundle/suite.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test: fix flaky tests by introducing komega
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/cert-manager/trust-manager/pull/252#issuecomment-1873789063): >/cherrypick release-0.7 > >Required to cherry-pick https://github.com/cert-manager/trust-manager/pull/260. Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
erikgb commented 7 months ago

Created manual cherry-pick PR: https://github.com/cert-manager/trust-manager/pull/264