-
Notifications
You must be signed in to change notification settings - Fork 53
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: check for unsat resolutions in Reconcile #352
Conversation
Codecov Report
@@ Coverage Diff @@
## main #352 +/- ##
==========================================
- Coverage 82.84% 82.13% -0.71%
==========================================
Files 21 21
Lines 892 907 +15
==========================================
+ Hits 739 745 +6
- Misses 107 114 +7
- Partials 46 48 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
|
79c11b9
to
fc6da0e
Compare
fc6da0e
to
1eedfd0
Compare
Makefile
Outdated
@@ -113,7 +113,7 @@ test-unit: $(SETUP_ENVTEST) ## Run the unit tests | |||
e2e: KIND_CLUSTER_NAME=operator-controller-e2e | |||
e2e: KUSTOMIZE_BUILD_DIR=config/e2e | |||
e2e: GO_BUILD_FLAGS=-cover | |||
e2e: run kind-load-test-artifacts test-e2e e2e-coverage kind-cluster-cleanup ## Run e2e test suite on local kind cluster | |||
e2e: kind-cluster-cleanup run kind-load-test-artifacts test-e2e e2e-coverage kind-cluster-cleanup ## Run e2e test suite on local kind cluster |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a preemptive cleanup of a pre-existing e2e cluster. I was running into the slight annoyance of the e2e failing, the last kind-cluster-cleanup
not running, and then having to manually delete the cluster to be able to run the e2e again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding kind-cluster-cleanup
early in the dependency line won't work; as make
will have recognized that target as already completed by the time it gets to the second kind-cluster-cleanup
. So it won't be run, and it will never clean up!
// TODO: Checking for unsat is awkward using the current version of deppy. | ||
// This awkwardness has been fixed in an unreleased version of deppy. | ||
// When there is a new minor release of deppy, we can revisit this and | ||
// simplify this to a normal error check. | ||
// See https://github.com/operator-framework/deppy/issues/139. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the working group call today, I mentioned that I would try to go ahead and bump deppy to the commit containing this fix.
Unfortunately that commit brings in some breaking changes with deppy's removal of the EntitySource API, so we'll have to wait until operator-controller accounts for that change. (see #347)
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
1eedfd0
to
088aaa7
Compare
b99cc20
Description
Closes #330
Reviewer Checklist