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

CA: fix update-deps.sh, bump k8s dependencies to v1.33.0-alpha.0 #7538

Merged
merged 2 commits into from
Nov 27, 2024

Conversation

towca
Copy link
Collaborator

@towca towca commented Nov 27, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Bump CA k8s.io dependencies to the newest k/k master tag v1.33.0-alpha.0. This is needed to bring kubernetes/kubernetes#127904 in so that CA can integrate with DRA scheduler plugin.

I ran into an update-deps.sh corner case, so there's a small fix for that as well (described in the commit message).

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/assign @jackfrancis

There doesn't seem to be any benefit to tidying after
getting every dependency pkg. And trying to tidy after
every get seems bugged:

* Some of the k8s.io dependencies depend on each other.
  For example k8s.io/client-go depends on k8s.io/api.
* We bump k8s.io/api to a new version, and that version removes
  some pkg (e.g. replaces v1alpha1 with v1alpha2), that
  some other dependency (e.g. k8s.io/client-go) requires.
* If we try to tidy immediately after getting k8s.io/api, this can
  fail because the required new k8s.io/api version doesn't have the
  removed pkg that k8s.io/client-go (still at a lower version
  since we haven't processed it yet) requires.

Getting all of the dependencies at the new versions first, and then
tidying once afterwards solves this issue.
@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 27, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: towca

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 27, 2024
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
k8s.io/apimachinery v0.33.0-alpha.0
Copy link
Contributor

Choose a reason for hiding this comment

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

wouldn't this tag be more appropriate?:

Copy link
Collaborator Author

@towca towca Nov 27, 2024

Choose a reason for hiding this comment

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

It definitely would until we release 1.32 CA, but the rc tags aren't mirrored in the staged k8s.io repos for some reason (see https://github.com/kubernetes/api/tags), so update-deps.sh doesn't work with that tag.

v1.33.0-alpha.0 should be okay though, if I'm looking correctly v1.32.0-rc.0 only has an empty release commit on top of v1.33.0-alpha.0:

Copy link
Contributor

Choose a reason for hiding this comment

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

sgtm

@jackfrancis
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 27, 2024
@k8s-ci-robot k8s-ci-robot merged commit 61eae9e into kubernetes:master Nov 27, 2024
6 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. area/cluster-autoscaler cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants