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

Bump k8s deps to v0.24.6 #31

Closed
wants to merge 16 commits into from
Closed

Bump k8s deps to v0.24.6 #31

wants to merge 16 commits into from

Conversation

misberner
Copy link
Contributor

Also bumps the Helm dep to a non-vulnerable version

SimonBaeumer and others added 14 commits May 5, 2022 09:28
@SimonBaeumer
Fork helm-operator adjustments for CI and documentation (#4)
7297941
@SimonBaeumer
Updated README (#5)
6d015a9
@SimonBaeumer
fixed typo in README (#7)
7f2e3d5
@misberner @SimonBaeumer
Allow adding reconciliation extensions (#9)
091ca1d
@misberner @SimonBaeumer
Allow marking releases stuck in a pending state as failed (#16)
e3f44bd
@misberner @SimonBaeumer
Allow stripping manifest from the CR status (#18)
3cc4460
@misberner @SimonBaeumer
ROX-7242: Make the operator preserve custom statuses, and allow updat…
dd01e3d 
…ing custom status through extensions (#17)
@porridge @SimonBaeumer
ROX- 8130: Add WithExtraWatch option. (#22)
a8d57a5
@SimonBaeumer
Fix updater test to use existing fields from deployment's status field
3764c49
@mtesseract
Fix reconciler log format message (#25)
e51d017 
Fix log format string interpolation
@porridge
Clone the REST config to prevent data races in the k8s.io/cli-runtime…
be98f83 
… library. (#26)
@misberner
Fix memory leak due to misuse of K8s clients (#30)
9d1614a
@vladbologa @porridge
ROX-12219: Add support for pause-reconcile annotation (#29)
89f9785 
Co-authored-by: Marcin Owsiany <porridge@redhat.com>
bump k8s deps to v0.24.6 and use non-vulnerable helm dep
3de884b
@misberner misberner mentioned this pull request Sep 29, 2022
Merged
5 tasks
porridge
porridge reviewed Oct 3, 2022
View reviewed changes
Copy link
Contributor

@porridge porridge left a comment

Choose a reason for hiding this comment

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

Perhaps it would be better to rebase our changes instead?
Upstream seems to have already done this, and some of their changes are different to what you did 🤔

@misberner
Copy link
Contributor Author

Good point, rebased: #32 (I dropped my memory leak fix from our branch because it already is upstream).

What's the process for rebasing, just hard set our main ref to the HEAD of the rebased- branch and then force push? Or just leave the rebased- branch and set it as the default in GitHub?

Btw, if you're referring to the kubeclock fix, I would say that my fix is what is actually required here. I can try to upstream it.

@misberner
Copy link
Contributor Author

operator-framework/helm-operator-plugins#199

@porridge
Copy link
Contributor

porridge commented Oct 4, 2022 •
edited

hard set our main ref to the HEAD of the rebased- branch and then force push

☝️ this one

But before doing so please also create a main-backup-<date> tag at the current tip of main just in case.

And you'll need to temporarily disable branch protection in settings to do the force-push.

@misberner
Copy link
Contributor Author

Superseded by #32

@misberner misberner closed this Oct 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@porridge porridge porridge left review comments

@SimonBaeumer SimonBaeumer Awaiting requested review from SimonBaeumer

Assignees
No one assigned
Labels
area/deps area/main-binary area/sdk area/testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@misberner @porridge @SimonBaeumer @mtesseract @vladbologa