Skip to content

Conversation

@jelmer
Copy link
Contributor

@jelmer jelmer commented Sep 3, 2022

Add support for Kubernetes 1.25.

Move to CRDs removed in Kubernetes 1.25:

  • policyv1beta1.PodDisruptionBudget => policyv1.PodDisruptionBudget
  • batchv1beta1.CronJob => batchv1.CronJob

Issue: #3365

@jelmer jelmer marked this pull request as draft September 3, 2022 20:36
@jelmer jelmer marked this pull request as ready for review September 4, 2022 14:58
@zevisert
Copy link

Hey @cbandy, would you normally review a change like this? I'm looking for PGO support on 1.25

@andrewlecuyer
Copy link
Collaborator

Hi @jelmer!

I just wanted to quickly reach out let you know that we're currently working on some dependency updates in the following PR, which we will be working in-front of some planned updates to enable Kubernetes 1.25 support in PGO: #3362.

Therefore, I did want to be sure you were aware that we are planning to add support Kubernetes 1.25 in the coming weeks once #3362 is merged. We are happy to review this PR at that time (so feel free to leave it open!), but some changes/updates will likely be required.

@jelmer
Copy link
Contributor Author

jelmer commented Sep 15, 2022

Hi Andrew,

Thanks for the heads-up. Happy to update this PR once the other changes happen.

@benjaminjb
Copy link
Contributor

Hi @jelmer,
First, thanks for this.

Second, I'm hoping to merge the dependency update sometime this week, which includes changes like a generic logging update, the Handler=>ProbeHandler change, and the patch change.

Since I'm handling that, could you simplify this PR to focus on the API deprecations for policyv1 and batchv1? That would be very helpful.
Cheers!

@jelmer jelmer changed the title Add support for Kubernetes 1.25 Fix compatibility with Kubernetes 1.25 Sep 26, 2022
@jelmer jelmer force-pushed the kubernetes-1.25 branch 2 times, most recently from 2f9dcd8 to 71f5e37 Compare September 26, 2022 04:30
@jelmer
Copy link
Contributor Author

jelmer commented Sep 26, 2022

@benjaminjb done, rebased on your branch.

@benjaminjb
Copy link
Contributor

Hey @jelmer thanks, my branch was still in-progress when you rebased -- can you maybe rebase off master now instead?

@jelmer
Copy link
Contributor Author

jelmer commented Sep 29, 2022

@benjaminjb done

@benjaminjb
Copy link
Contributor

Two things the linter caught:

  • internal/controller/postgrescluster/cluster_test.go is missing the import batchv1 "k8s.io/api/batch/v1"
  • internal/controller/postgrescluster/pgbouncer_test.go has the import policyv1 "k8s.io/api/policy/v1beta1" -- should drop the beta1 suffix

This changes in particular:

 * policyv1beta1.PodDisruptionBudget => policyv1.PodDisruptionBudget
 * batchv1beta1.CronJob => batchv1.CronJob
@jelmer
Copy link
Contributor Author

jelmer commented Sep 29, 2022

Fixed!

Co-authored-by: Benjamin Blattberg <benjamin.blattberg@gmail.com>
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.

4 participants