Skip to content

Pin k8s.io/kuberenetes + dependency bumps #706

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

Merged
merged 1 commit into from
Jul 18, 2025

Conversation

dereknola
Copy link
Contributor

@dereknola dereknola commented Jun 9, 2025

#704 is in a broken state and I lack permissions to fix it. Opening this PR instead.

Changes

  • Pin k8s.io/kubernetes to match the rest of the k8s dependencies
  • Keep go 1.23.0 the above issue was causing go to be bumped when it should not be.

Validation

make works locally

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 9, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @dereknola. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 9, 2025
go.mod Outdated
k8s.io/kubernetes v1.30.12
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.33.1
Copy link
Contributor Author

@dereknola dereknola Jun 9, 2025

Choose a reason for hiding this comment

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

Not actually a bump, as most of these are pinned via replacement calls below.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you please change it to v1.30.12?

jamie-albert added a commit to jamie-albert/advisories that referenced this pull request Jun 10, 2025
…j-x2gw

CoreDNS v1.11.3 vulnerability in github.com/coredns/coredns. Upstream fix in progress at kubernetes/dns#706. Marking as pending-upstream-fix while waiting for PR to be merged and new release.
github-merge-queue bot pushed a commit to wolfi-dev/advisories that referenced this pull request Jun 10, 2025
…j-x2gw (#19083)

CoreDNS v1.11.3 vulnerability in github.com/coredns/coredns. Upstream fix in progress at kubernetes/dns#706. Marking as pending-upstream-fix while waiting for PR to be merged and new release.
Copy link
Collaborator

@DamianSawicki DamianSawicki left a comment

Choose a reason for hiding this comment

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

I think it would suffice to pin k8s.io/kubernetes and then rely on dependabot, but if it's time sensitive, we can leave it this way for the last time.

Also, I was hoping that we can get rid of pinning entirely and rely on dependabot bumping minor versions of non-k8s dependencies and patch versions of k8s.io dependencies, but the discussion on #709 seems to suggest that we can't get away without pinning if we want to control the kubernetes minor (historically we haven't, but @dereknola seems to be in favor of it recently). CC: @Michcioperz

go.mod Outdated
go.etcd.io/etcd/client/v2 v2.305.21
go.etcd.io/etcd/client/v3 v3.6.0
golang.org/x/net v0.40.0
k8s.io/api v0.32.3
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we get rid of these (or restore them to v.0.30.12)? They seem to be pinned anyway.

  k8s.io/api v0.32.3
  k8s.io/apimachinery v0.32.3
  k8s.io/client-go v0.32.3
...
  k8s.io/kubernetes v1.33.1

Copy link
Collaborator

Choose a reason for hiding this comment

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

I tried myself restoring them to v.0.30.12/v1.30.12, but go mod tidy bumps api, apimachinery, and client-go back to v0.32.3. It's seems possible to downgrade kubernetes, though.

@dereknola
Copy link
Contributor Author

@DamianSawicki I'm on board with letting dependabot handle things and moving towards the latest versions of k8s. I would support that once this PR is merged, you open new PR that ensures all currently pinned k8s dependencies are removed, and a move to v1.33.XX/v0.33.XX across the board. Dependabot can then take over any future bumps.

Copy link
Collaborator

@DamianSawicki DamianSawicki left a comment

Choose a reason for hiding this comment

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

/ok-to-test

I'm on board with letting dependabot handle things and moving towards the latest versions of k8s.

Cool, thanks a lot for sharing your perspective here!

I would support that once this PR is merged, you open new PR that ensures all currently pinned k8s dependencies are removed, and a move to v1.33.XX/v0.33.XX across the board.

Moving to v1.33.XX/v0.33.XX may involve some non-trivial changes, so we'd need to see who will have time to work on it.

go.mod Outdated
go.etcd.io/etcd/client/v2 v2.305.21
go.etcd.io/etcd/client/v3 v3.6.0
golang.org/x/net v0.40.0
k8s.io/api v0.32.3
Copy link
Collaborator

Choose a reason for hiding this comment

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

I tried myself restoring them to v.0.30.12/v1.30.12, but go mod tidy bumps api, apimachinery, and client-go back to v0.32.3. It's seems possible to downgrade kubernetes, though.

go.mod Outdated
k8s.io/kubernetes v1.30.12
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.33.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you please change it to v1.30.12?

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 7, 2025
@dereknola
Copy link
Contributor Author

Explicitly bumped the require dependency versions.

Bumps the non-k8s group with 13 updates:

| Package | From | To |
| --- | --- | --- |
| [github.com/coredns/coredns](https://github.com/coredns/coredns) | `1.11.3` | `1.12.2` |
| [github.com/miekg/dns](https://github.com/miekg/dns) | `1.1.63` | `1.1.66` |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.36.1` | `1.36.2` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.19.1` | `1.22.0` |
| [github.com/vishvananda/netlink](https://github.com/vishvananda/netlink) | `1.1.0` | `1.3.1` |
| [go.etcd.io/etcd/api/v3](https://github.com/etcd-io/etcd) | `3.5.18` | `3.6.0` |
| [go.etcd.io/etcd/client/pkg/v3](https://github.com/etcd-io/etcd) | `3.5.18` | `3.6.0` |
| [go.etcd.io/etcd/client/v2](https://github.com/etcd-io/etcd) | `2.305.18` | `2.305.21` |
| [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) | `3.5.18` | `3.6.0` |
| [golang.org/x/net](https://github.com/golang/net) | `0.38.0` | `0.40.0` |
| [k8s.io/klog/v2](https://github.com/kubernetes/klog) | `2.120.1` | `2.130.1` |
| [k8s.io/utils](https://github.com/kubernetes/utils) | `0.0.0-20230726121419-3b25d923346b` | `0.0.0-20241104100929-3ea5e8cea738` |

Pin k8s.io/kubernetes as well to v1.30.12

Signed-off-by: Derek Nola <[email protected]>

Make regular k8s dependencies explicitly v0.32.12

Signed-off-by: Derek Nola <[email protected]>
Copy link
Collaborator

@DamianSawicki DamianSawicki left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Thanks for your patience!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DamianSawicki, dereknola

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 18, 2025
@k8s-ci-robot k8s-ci-robot merged commit 025e0c3 into kubernetes:master Jul 18, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants