-
Notifications
You must be signed in to change notification settings - Fork 157
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
feat: Add 1.26, 1.27 and 1.29 deprecations #504
feat: Add 1.26, 1.27 and 1.29 deprecations #504
Conversation
I see that Sonar failed, but it is only complaining about duplicated entries of |
Could you kindly review @dark0dave, @stepanstipl? |
I am happy to approve, @stepanstipl can we get this merged? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me 👍 I'm happy to merge if the only failing test is the SonarCloud smell.
Many thanks for your effort @david-ortiz-saez 🎉 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rebase but looks good to me as well.
95c10f4
to
6575617
Compare
hi @dark0dave, @stepanstipl, I've rebased with master, everything should be fine now. Thanks for taking a look! |
Hi @david-ortiz-saez thanks 👍 , I see there are 2 tests failing, both minor cosmetic bits:
Footnotes |
I think it is fixed now @stepanstipl. Thanks for the tip |
Thanks @david-ortiz-saez - I was looking further into the last remaining issue, and it appears to be the rego file causing the trouble actually (apologies, I too quickly suggested it's the go code in my last comment): $ opa fmt -d -l pkg/rules/rego/* 0
pkg/rules/rego/deprecated-1-27.rego
$ opa fmt -d pkg/rules/rego/* 0
--- /var/folders/xq/17348xc93zx6hzxlcwt5kjtc0000gn/T/.opafmt666689532 2023-08-21 14:09:33.000000000 +0200
+++ /var/folders/xq/17348xc93zx6hzxlcwt5kjtc0000gn/T/.opafmt016151851 2023-08-21 14:09:33.000000000 +0200
@@ -21,9 +21,9 @@
deprecated_api(kind, api_version) = api {
deprecated_apis = {"CSIStorageCapacity": {
- "old": ["storage.k8s.io/v1beta1"],
- "new": "storage.k8s.io/v1",
- "since": "1.24",
+ "old": ["storage.k8s.io/v1beta1"],
+ "new": "storage.k8s.io/v1",
+ "since": "1.24",
}}
deprecated_apis[kind].old[_] == api_version You should be able to fix the formatting by running |
My bad @stepanstipl. I identified the file and modified it but I did it manually because I wasn't aware of the |
Hi @david-ortiz-saez thanks... I still see one of the tests failing 1 - it's about the - feat: include new deprecations in rego files
+ feat: Include new deprecations in rego files Almost there 😄, let's get this merged... Footnotes |
I understand @stepanstipl, but how should I fix it? It is enough to add a new silly commit following that pattern so semantic release is triggered or do I need to force-push all the changes again in one single commit following the pattern? |
Hi @david-ortiz-saez, all commits are checked to follow the pattern, i.e. it's not enough to just add one commit at the end. Here's how I do this - interactive rebase, which lets you edit commit messages, i.e.: # make sure your local master is up-to-date
git checkout master
git pull
# switch to PR branch
git checkout add-126-127-129-deprecations
# rebase
git rebase -i master In the editor you'll change the beginning of commits you want to change to You'll need to force-push after. Hope this helps 🤞 |
7e6b0b9
to
6c39a9d
Compare
thanks for the tip @stepanstipl! Everything should be fine now (I hope) |
Hi @david-ortiz-saez all the tests look good, great job! 👍 One - hopefully really last thing - we require all commits to be signed, more on that 12 (I typically recommend going with GPG). Feel free to let me know if you need any help with that. Cheers 🙏 Footnotes |
Hi @stepanstipl, I had configured the signing, but somehow during last rebase they were lost?
When I forced pushed these changes, the UI told me that my branch was not updated with master and I clicked on rebase button on the UI, then the 4 initial commits disappeared, but the signature in my commits was also removed. What should be the proper approach here? |
Hi @david-ortiz-saez, ok if you have git configured to sign then it should be ok when you just do rebase, but I assume if you use the GH UI functionality, it's not signing the commits (sorry, not sure, I don't use it). The actual steps might depend a bit on how is your repo set up (forked), but based on the "not updated" message you mentioned, I'm assuming you're rebasing on your fork, instead of this repo master. You can try smth. like this:
and push. 🤞 |
6c39a9d
to
025e291
Compare
@stepanstipl I think this is the good one, I've modified the commits and force pushed, I see that the branch is updated and the commits are compliance and signed. |
All good, thanks a lot for getting this through @david-ortiz-saez! 🎉 |
When can we expect the release of this PR? |
Great news. I saw in the nightly build that the 1.27 deprecation (storage api) was listed in "future" deprecations even when I select target version 1.27. |
WHAT
This PR is adding the following deprecations.
flowcontrol
CSIStorageCapacity
flowcontrol
Example
This has been tested with the resources included inside fixtures in a k8s v1.24 running cluster. Here is the output:
NOTE. There is an existing open PR with this purpose, but it has been stalled for 60 days.