Skip to content

chore: bump helm-operator fork to new rebase #14233

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

Merged
merged 4 commits into from
Feb 13, 2025

Conversation

porridge
Copy link
Contributor

@porridge porridge commented Feb 12, 2025

Description

Our changes to helm-operator were rebased on top of the most recent release. This change switches to using this code.

This also happens to bump the k8s libraries.

In this repo, one minor change to a function was needed due to a slightly incompatible controller-runtime API change.

In the helm-operator repo, there were more changes needed due to more strict lint checking. Please review them in the context of this PR.

Most differences are due to differing context. Actual changes to the code made during the rebase were in patches:

  • 4 - changed spelling of Failed to Failds in a few places to reduce the constant reformatting churn - when upstreaming we'll need to change this to correct spelling, but for now it's just a PITA; nolint:unparam added in handlePending to silence overzealous "first value returned is always nil" warning; error message formatting due to linter complaints
  • 5+11 - merged into a single patch, fixed ginkgo linter complaint
  • 7 - removed unused watchDescription
  • 10, 12 - fixed ginkgo linter complaint

Also a round of make -C operator generate manifests bundle was needed.

Yet another change was needed to compliance operator test do deal with a breaking change in controller runtime.

User-facing documentation

  • CHANGELOG is updated OR update is not needed
  • documentation PR is created and is linked above OR is not needed

Testing and quality

  • the change is production ready: the change is GA or otherwise the functionality is gated by a feature flag
  • CI results are inspected

Automated testing

  • no changes to tests needed

How I validated my change

CI is enough.

Copy link

openshift-ci bot commented Feb 12, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 12, 2025

Images are ready for the commit at 4721599.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-724-g47215999fe.

Copy link

codecov bot commented Feb 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.08%. Comparing base (2be1cc8) to head (bff1abc).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #14233   +/-   ##
=======================================
  Coverage   49.08%   49.08%           
=======================================
  Files        2514     2514           
  Lines      182769   182769           
=======================================
+ Hits        89705    89707    +2     
+ Misses      85944    85943    -1     
+ Partials     7120     7119    -1     
Flag Coverage Δ
go-unit-tests 49.08% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@porridge
Copy link
Contributor Author

/test all

@porridge porridge added the auto-retest PRs with this label will be automatically retested if prow checks fails label Feb 12, 2025
@rhacs-bot
Copy link
Contributor

/retest

2 similar comments
@rhacs-bot
Copy link
Contributor

/retest

@rhacs-bot
Copy link
Contributor

/retest

@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 12, 2025

Images are ready for the commit at 36821dd.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-733-g36821dd1ba.

@porridge
Copy link
Contributor Author

Looks like the test is passing but the cluster destroy is failing.

INFO[2025-02-12T11:10:35Z] Running step operator-e2e-tests-stackrox-stackrox-e2e-test. 
INFO[2025-02-12T11:49:37Z] Step operator-e2e-tests-stackrox-stackrox-e2e-test succeeded after 39m1s. 

@porridge porridge marked this pull request as ready for review February 12, 2025 15:01
@porridge porridge requested a review from a team as a code owner February 12, 2025 15:01
@porridge porridge force-pushed the porridge/bump-helm-operator branch from 4721599 to 36821dd Compare February 12, 2025 15:35
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 12, 2025

Images are ready for the commit at bff1abc.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.8.x-4-gbff1abc21e.

@porridge porridge force-pushed the porridge/bump-helm-operator branch from 36821dd to bff1abc Compare February 13, 2025 08:48
@porridge porridge enabled auto-merge (squash) February 13, 2025 08:53
@porridge porridge merged commit d6460d1 into master Feb 13, 2025
82 of 91 checks passed
@porridge porridge deleted the porridge/bump-helm-operator branch February 13, 2025 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/operator auto-retest PRs with this label will be automatically retested if prow checks fails
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants