Skip to content
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.

Sign up for GitHub

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

Jump to bottom

✨ Helm poc unpack image #811

Merged
merged 1 commit into from
May 6, 2024
Merged

✨ Helm poc unpack image #811

merged 1 commit into from
May 6, 2024

Conversation

dtfranz
Copy link
Contributor

@dtfranz dtfranz commented May 1, 2024

Builds and loads the unpacker binary into the operator-controller image so we don't need to use the rukpak image.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 1, 2024
@dtfranz dtfranz force-pushed the helm-poc_unpack-image branch 2 times, most recently from e0f2060 to a26e609 Compare May 2, 2024 18:19
@dtfranz dtfranz changed the title Draft: Helm poc unpack image Helm poc unpack image May 2, 2024
@dtfranz dtfranz marked this pull request as ready for review May 2, 2024 18:20
@dtfranz dtfranz requested a review from a team as a code owner May 2, 2024 18:20
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 2, 2024
varshaprasad96
varshaprasad96 reviewed May 2, 2024
View reviewed changes
Makefile Show resolved Hide resolved
config/manager/manager.yaml Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
varshaprasad96
varshaprasad96 reviewed May 2, 2024
View reviewed changes
config/manager/kustomization.yaml
@@ -6,3 +6,23 @@ images:
- name: controller
newName: quay.io/operator-framework/operator-controller
newTag: devel
replacements:
Copy link
Member

Choose a reason for hiding this comment

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

This is nice! I think in rukpak we had to manually edit the image in manager.

varshaprasad96
varshaprasad96 reviewed May 2, 2024
View reviewed changes
Copy link
Member

@varshaprasad96 varshaprasad96 left a comment •
edited

Choose a reason for hiding this comment

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

The changes look good! Thanks @dtfranz

Before merging, could you please test this and confirm if it works as expected locally as there are no tests in place for now.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2024
@dtfranz dtfranz force-pushed the helm-poc_unpack-image branch 2 times, most recently from f5c15bd to 7d3049d Compare May 6, 2024 17:20
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 6, 2024
@tmshort
Copy link
Contributor

tmshort commented May 6, 2024 •
edited

You need to do a go mod tidy (sanity / verify job)

@tmshort
Copy link
Contributor

tmshort commented May 6, 2024

You need to add an emoji to the start of the PR.

Please prefix the title of this PR with one of the following icons:

    * ⚠ (:warning:, major/breaking change)
    * ✨ (:sparkles:, minor/compatible change)
    * 🐛 (:bug:, patch/bug fix)
    * 📖 (:book:, docs)
    * 🌱 (:seedling:, other)

@tmshort
Copy link
Contributor

tmshort commented May 6, 2024

Also, seeing this error during make verify in CI (but not local):

/bin/sh: 1: [[: not found
/bin/sh: 1: /home/runner: Permission denied

@dtfranz
Unpack Image
23d20c1 
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>
@dtfranz dtfranz changed the title Helm poc unpack image ✨ Helm poc unpack image May 6, 2024
@tmshort tmshort merged commit b4a2e60 into operator-framework:helm-poc May 6, 2024
7 of 11 checks passed
tmshort pushed a commit that referenced this pull request May 6, 2024
@dtfranz @tmshort
Unpack Image (#811)
354029a 
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>
tmshort pushed a commit that referenced this pull request May 6, 2024
@dtfranz @tmshort
Unpack Image (#811)
d948c21 
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>
varshaprasad96 pushed a commit to varshaprasad96/operator-controller that referenced this pull request May 10, 2024
@dtfranz @varshaprasad96
Unpack Image (operator-framework#811)
e1dc448 
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>
tmshort pushed a commit that referenced this pull request May 11, 2024
@dtfranz @tmshort
Unpack Image (#811)
ebdd1f1 
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>
bentito pushed a commit that referenced this pull request May 14, 2024
@dtfranz @bentito
Unpack Image (#811)
9b13ee8 
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>
bentito pushed a commit that referenced this pull request May 14, 2024
@dtfranz @bentito
Unpack Image (#811)
16bf815 
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>
dtfranz added a commit that referenced this pull request May 23, 2024
@dtfranz
Unpack Image (#811)
cd42513 
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>
github-merge-queue bot 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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varshaprasad96 varshaprasad96 varshaprasad96 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtfranz @tmshort @varshaprasad96 @openshift-merge-robot