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

Bump k8s to 1.29 versions #6736

Merged

Conversation

Neo2308
Copy link
Contributor

@Neo2308 Neo2308 commented May 1, 2024

Description of the change:

  • Bump k8s dependencies to 0.29.3
  • Bump other operator-framework lib versions to support k8s 0.29.x
  • Bump ginkgo/v2 to v2.17.2

TODO:

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

go.mod Outdated Show resolved Hide resolved
@Neo2308 Neo2308 force-pushed the feature/master/bump-k8s-1.29 branch from a1a62cb to e6fb2d8 Compare May 22, 2024 01:59
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 13, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2024
@Neo2308
Copy link
Contributor Author

Neo2308 commented Jul 15, 2024

@joelanford, @everettraven, @acornett21 could you review this PR?

@acornett21
Copy link
Contributor

@Neo2308 This doesn't have the proper version of the ansilbe-plugin, I'll work on releasing today. Also, it doesn't have the proper version of the helm plugin, since we'll need to backfill that to have a matching version of kubebuilder.

@acornett21
Copy link
Contributor

@Neo2308 ansible-operator-plugin v1.35.0` has been released for you to use.

@acornett21 acornett21 changed the title Bump k8s versions Bump k8s to 1.29 versions Jul 17, 2024
@acornett21
Copy link
Contributor

@Neo2308 Can you pull this version in for the java plugin?
https://github.com/operator-framework/java-operator-plugins/releases/tag/v0.10.0

@acornett21
Copy link
Contributor

acornett21 commented Jul 23, 2024

Hi @Neo2308 Sorry for the delay, but it took 11 PR's to get the helm-operator-plugin backfilled to the proper version of kubebuilder.

You can use this version in this PR
https://github.com/operator-framework/helm-operator-plugins/releases/tag/v0.2.2

I think after this all the deps are in proper shape, we'd just have to look to make sure all scaffolding/testing/etc passes CI.

@Neo2308
Copy link
Contributor Author

Neo2308 commented Jul 24, 2024

@acornett21 any idea how to fix the failing docs sanity?

@acornett21
Copy link
Contributor

@Neo2308 I'm unsure, I don't have access to the routes/etc for the website. I asked here in slack about this and for additional reviews.

I'll spend sometime tomorrow reviewing/testing this myself as well.

k8s.io/cli-runtime v0.28.5
k8s.io/client-go v0.28.5
k8s.io/kubectl v0.28.5
helm.sh/helm/v3 v3.14.3

Choose a reason for hiding this comment

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

Hey, if there isn't any problem with version compatibility, is it possible to bump Helm to v3.15.0, which can also help fix CVE-2019-25210?

Copy link
Contributor

Choose a reason for hiding this comment

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

There is a problem with version compatibility, 3.15 is based off of k8s 1.30, so if helm was updated here it would also update k8s which is not what we want. That version will be part of the k8s 1.30 work.

Choose a reason for hiding this comment

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

Makes sense. Thanks a lot, @acornett21.

@acornett21
Copy link
Contributor

@Neo2308 Doing some testing today, and am updating the PR description as I find more issues this fixes/closes.

@acornett21
Copy link
Contributor

I've tested all the things I care to test and everything looks good.

@acornett21
Copy link
Contributor

Hi @Neo2308 Can you change the below?

https://github.com/operator-framework/operator-sdk/blob/master/website/config.toml#L202

to
https://github.com/operator-framework/operator-sdk/tree/v1.20.x/website/content/en/docs

It seems like there is a limit on the number of subdomains. Thanks.

Copy link
Member

@varshaprasad96 varshaprasad96 left a comment

Choose a reason for hiding this comment

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

Apart from the change made in website/config.toml, rest of it looks good! Changing that would end up triggering a change in netlify configuration (iirc), and that's something we don't want in this PR. Could you please revert it back?

@Neo2308 Thanks for the contribution! Rest of the changes look good!

/lgtm after its reverted.

@@ -199,7 +199,7 @@ url_latest_version = "https://sdk.operatorframework.io"

[[params.versions]]
version = "v1.20"
url = "https://v1-20-x.sdk.operatorframework.io"
url = "https://github.com/operator-framework/operator-sdk/tree/v1.20.x/website/content/en/docs"
Copy link
Member

Choose a reason for hiding this comment

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

I think this should be reverted back. This change is made only with the release PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is needed since v1-20-x is no longer a subdomain, without this change the docs GHA fails

@acornett21 acornett21 merged commit 0b9318a into operator-framework:master Jul 29, 2024
23 checks 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
5 participants