Skip to content

✨ OPRUN-3293 Fixes several unit tests - not cache ones - #831

Merged
tmshort merged 2 commits into
operator-framework:helm-pocfrom
bentito:helm-poc
May 10, 2024
Merged

✨ OPRUN-3293 Fixes several unit tests - not cache ones #831
tmshort merged 2 commits into
operator-framework:helm-pocfrom
bentito:helm-poc

Conversation

@bentito

@bentitobentito commented May 3, 2024

Copy link
Copy Markdown
Contributor

Description

Fixes several ClusterExtension controller related unit tests. Not ones related to cache not being started though.

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

@bentito
bentito requested a review from a team as a code ownerMay 3, 2024 18:53
bentito
bentito commented May 3, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go Outdated
bentito
bentito commented May 3, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller_test.go Outdated
bentito
bentito commented May 3, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller_test.go Outdated
varshaprasad96
varshaprasad96 reviewed May 3, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go
Comment threadinternal/controllers/clusterextension_controller.go Outdated
Comment threadinternal/controllers/clusterextension_controller.go
Comment threadinternal/controllers/clusterextension_controller.go Outdated
Comment threadinternal/controllers/clusterextension_controller_test.go Outdated
@openshift-merge-robotopenshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2024
varshaprasad96
varshaprasad96 reviewed May 3, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go Outdated
@openshift-merge-robotopenshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2024
@bentito

bentito commented May 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Remaining ClusterExtension controller unit test fails should now be limited to:

  • something messed up in code with "cache not started";
  • rukpak refs needing to be pulled from test code

@tmshort

This comment was marked as outdated.

Sign in to view
tmshort
tmshort reviewed May 6, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go Outdated
tmshort
tmshort reviewed May 6, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go Outdated
@tmshort
tmshortforce-pushed the helm-poc branch 2 times, most recently from 354029a to d948c21CompareMay 6, 2024 19:20
@tmshort

tmshort commented May 6, 2024

Copy link
Copy Markdown
Contributor

Yeah, you may need to cherry-pick your commit to the updated helm-poc branch... not sure rebase will be smart enough due to the squash.

varshaprasad96
varshaprasad96 reviewed May 6, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller_test.go
tmshort
tmshort reviewed May 7, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go
tmshort
tmshort reviewed May 7, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go
tmshort
tmshort reviewed May 7, 2024
View reviewed changes
Comment threadinternal/controllers/clusterextension_controller.go Outdated
@bentito
Fix, rm or skip BundleDeployment related tests
23c8e8a
Signed-off-by: Brett Tofel <btofel@redhat.com>
@bentito
Address lint errors
3e1f6e6
Signed-off-by: Brett Tofel <btofel@redhat.com>
tmshort
tmshort approved these changes May 10, 2024
View reviewed changes

@tmshorttmshort left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2024
@tmshort
tmshort merged commit 0d3aa8f into operator-framework:helm-pocMay 10, 2024
varshaprasad96 pushed a commit to varshaprasad96/operator-controller that referenced this pull request May 10, 2024
@bentito@varshaprasad96
✨ OPRUN-3293 Fixes several unit tests - not cache ones (operator-fram…
2fcfe96
…ework#831)
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
tmshort pushed a commit that referenced this pull request May 11, 2024
@bentito@tmshort
✨ OPRUN-3293 Fixes several unit tests - not cache ones (#831)
3e5f5a0
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
bentito added a commit that referenced this pull request May 14, 2024
@bentito
✨ OPRUN-3293 Fixes several unit tests - not cache ones (#831)
be55c4a
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
bentito added a commit that referenced this pull request May 14, 2024
@bentito
✨ OPRUN-3293 Fixes several unit tests - not cache ones (#831)
0f57754
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
dtfranz pushed a commit that referenced this pull request May 23, 2024
@bentito@dtfranz
✨ OPRUN-3293 Fixes several unit tests - not cache ones (#831)
7a79d1a
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
github-merge-queueBot pushed a commit that referenced this pull request May 30, 2024
@bentito@tmshort
@dtfranz@varshaprasad96
✨ Modify ClusterExtension to use Helm under the hood to apply content…
0058054
…s into the cluster (#846)
* Helm POC rebase-a-thon
* Unpack Image (#811)
Builds and loads the unpacker binary into the operator-controller image so we don't need to use the rukpak image.
Signed-off-by: dtfranz <dfranz@redhat.com>
* ✨ OPRUN-3293 Fixes several unit tests - not cache ones (#831)
* Fix, rm or skip BundleDeployment related tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address lint errors
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Fix e2e (#843)
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
* Make goreleaser build unpack
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Rm commented code
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Rebase required changes
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Cleanups (#854)
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
* Expand comments in Dockerfile
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Address Reviews
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
* Back out packagerrors
It's agreed that this makes debugging and reasoning about log messages and runtime errors much harder.
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Helm POC e2e fixes (#870)
Fixes the e2e tests in helm-poc branch and restores feature-gate switching.
Signed-off-by: dtfranz <dfranz@redhat.com>
* Fix defer location (#883)
Fixes the defer location to make sure that all resources are cleaned up properly.
Signed-off-by: dtfranz <dfranz@redhat.com>
* Remove BundleDeployments gathering from e2e's gatherArtifacts (#886)
When tests fail, gatherArtifacts is run to collect cluster state. This PR removes gathering of BundleDeployments since we don't use them anymore and it's generating additional misleading error messages.
Signed-off-by: dtfranz <dfranz@redhat.com>
* Address reviews (#887)
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
* 🌱 Proposed way to unskip some tests (#874)
* Proposed way to unskip some tests
TestClusterExtensionChannelVersionExists mostly restored here
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Refactors global variable names
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Removes BundleDeployment related checking
In just one test, for now.
Signed-off-by: Brett Tofel <btofel@redhat.com>
* fix unit test - TestClusterExtensionChannelVersionExists
* Unskip all - failing tests (up|down)grade should err
Unskips all in clusterextension_controller_test.go
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Unskip all clusterextension_registryv1_validation_test.go
Still failing tests (up|down)grade should err b/c we don't have an installedBundle to check against
Signed-off-by: Brett Tofel <btofel@redhat.com>
* debugging
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
* Fixes and additions pending & unpack path
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Fix linter, remove debug logs and extraneous file
Signed-off-by: dtfranz <dfranz@redhat.com>
* Fix e2e failure due to race condition
Signed-off-by: dtfranz <dfranz@redhat.com>
---------
Signed-off-by: Brett Tofel <btofel@redhat.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Signed-off-by: dtfranz <dfranz@redhat.com>
Co-authored-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Co-authored-by: dtfranz <dfranz@redhat.com>
* Revert goreleaser to use buildx
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Revert all of goreleaser to use buildx
Signed-off-by: Brett Tofel <btofel@redhat.com>
* Revert errorf->printf & rm some logging in tests
Signed-off-by: Brett Tofel <btofel@redhat.com>
---------
Signed-off-by: dtfranz <dfranz@redhat.com>
Signed-off-by: Brett Tofel <btofel@redhat.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Co-authored-by: Todd Short <tshort@redhat.com>
Co-authored-by: Daniel Franz <dfranz@redhat.com>
Co-authored-by: Varsha <varshaprasad96@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@varshaprasad96varshaprasad96varshaprasad96 left review comments
@tmshorttmshorttmshort approved these changes

Assignees

@tmshorttmshort

Labels

lgtmIndicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bentito@tmshort@varshaprasad96@openshift-merge-robot