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.

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

Changed API version for poddisturtionbudget #361

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

GrankoKocur
Copy link

@GrankoKocur GrankoKocur commented Jul 28, 2023

In kubernetes version 1.25 the API policy/v1beta1 for PDB was removed
The helm chart still uses this old API and is making upgrading impossible

Steps to reproduce:

  1. Install RKE2 in version 1.24.x with calicoKubeControllers enabled
  2. Try to upgrade to RKE2 in version 1.25.x

@brandond
Copy link
Member

cc @manuelbuil @rbrtbnfgl

@GrankoKocur GrankoKocur requested a review from a team as a code owner August 21, 2023 13:21
@@ -1,2 +1,2 @@
url: local
packageVersion: 00
packageVersion: 01
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you check the file termination? Somehow there is this character that github doesn't recognize

Copy link
Author

Choose a reason for hiding this comment

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

Could you check it now?
File displays that it's ASCII text, cat displays line ends as $

Copy link
Contributor

Choose a reason for hiding this comment

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

now it's ok

@rbrtbnfgl
Copy link
Contributor

Could you do a local rebase of your branch?

@GrankoKocur
Copy link
Author

Not sure I did it correctly, could you check please?

@rbrtbnfgl
Copy link
Contributor

try this

git remote add remote git@github.com:rancher/rke2-charts.git
git pull remote
git rebase remote/main-source

There should be a conflict on packages/rke2-canal/package.yaml you can fix it by removing the wrong lines leaving only the right ones then

git add packages/rke2-canal/package.yaml
git rebase --continue

You should be aligned with the remote and you should have only one commit with your fix.

@GrankoKocur
Copy link
Author

done

@brandond
Copy link
Member

You need to rebase your branch on top of main-source, instead of pulling main-source into your branch. Once you've done that, please squash your commits and force push. The PR branch is not mergable in its current state.

In kubernetes version 1.25 the API policy/v1beta1 for PDB was removed
The helm chart still uses this old API and is making upgrading
impossible
@GrankoKocur
Copy link
Author

Didn't think I'd have so much trouble rebasing...

Anyways, please check if this works

@brandond brandond merged commit bf8007c into rancher:main-source Aug 29, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants