Skip to content

Conversation

@stephenfin
Copy link

@stephenfin stephenfin commented Jan 9, 2026

What type of PR is this?

/feature

What this PR does / why we need it:

This builds on #2498 and applies the changes from the bumped openapi-generator. The actual bump is achieved with kubernetes-client/gen#286. As with that PR, we go through each version between the current version (v4.3.0) and v6.6.0 individually, skipping over those with no effect.

As a result of the bump, it is necessary to regenerate the local patches we are carrying. We are able to drop one of these. Eventually we should be able to drop the others too, but not yet.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

This builds on #2498 which should merge first. This will be much easier to review once rebased.

My review of this suggests the changes here are entirely additive or documentation-related, but I may have missed something. Assuming this merges, I plan to continue working up through the versions until we get to the latest openapi-generator version (currently v7.18.0).

Does this PR introduce a user-facing change?

NONE

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


These have not built successfully for a long-time (over two years [1] at
time of writing). We should work to re-add these but lets focus on
getting out openapi-generator version bumped first.

[1] https://app.readthedocs.org/projects/kubernetes/builds/

Signed-off-by: Stephen Finucane <[email protected]>
Update examples that were moved in kubernetes-client#938 and fix title underlines
(docutils cares about this stuff).

Signed-off-by: Stephen Finucane <[email protected]>
Remove Python 2 stuff as well as unused or commented out configuration
values. Also add sphinx to the dependencies

Signed-off-by: Stephen Finucane <[email protected]>
Use more recent Python versions and remove use of the build_sphinx
distutils command which hasn't existed for many years now.

Signed-off-by: Stephen Finucane <[email protected]>
Python 3.13 is the latest and greatest.

Signed-off-by: Stephen Finucane <[email protected]>
We will subsequently overlay our own commits on this. We also stop
setting OPENAPI_GENERATOR_COMMIT: this is already being set by the
'openapi/python.sh' from 'kubernetes-client/gen' so setting it here is
very misleading.

With this change, any user should now be able to run e.g.:

  USERNAME=kubernetes CLIENT_ROOT=../kubernetes ./scripts/update-client.sh

and see zero changes (assuming kubernetes/kubernetes is in fact cloned
to the parent directory).

Signed-off-by: Stephen Finucane <[email protected]>
This was replacing the wrong method.

Signed-off-by: Stephen Finucane <[email protected]>
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 9, 2026
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: stephenfin
Once this PR has been reviewed and has the lgtm label, please assign roycaihw for approval. For more information see the Code Review Process.

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

Details 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 size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 9, 2026
Done in tandem with the bump in kubernetes-client/gen.

  GEN_ROOT=../client-gen USERNAME=kubernetes CLIENT_ROOT=../kubernetes ./scripts/update-client.sh

(`kubernetes-client/gen` and `kubernetes/kubernetes` are both cloned at the
parent directory)

Signed-off-by: Stephen Finucane <[email protected]>
Only whitespace changes.

Signed-off-by: Stephen Finucane <[email protected]>
Minor Python 2/3 changes.

Signed-off-by: Stephen Finucane <[email protected]>
Whitepsace and docs changes.

Signed-off-by: Stephen Finucane <[email protected]>
This adds a few new parameters.

Signed-off-by: Stephen Finucane <[email protected]>
Signed-off-by: Stephen Finucane <[email protected]>
We skip past v6.1.0 and v6.2.0 since there were no changes in these
releases.

Signed-off-by: Stephen Finucane <[email protected]>
@stephenfin stephenfin force-pushed the bump-openapi-generator branch from f736a85 to 57024dd Compare January 9, 2026 14:18
@stephenfin stephenfin changed the title Bump openapi-generator to v5.4.0 Bump openapi-generator to v6.6.0 Jan 9, 2026
Once again, we skip over releases (v6.4.0 and v6.5.0) since they don't
introduce any changes.

Bumping to v6.6.0 allows us to remove a carried patch (hurrah!).
Unfortunately though, this is also the last version to support the
'python-legacy' generator. The next version bump is unfortunately likely
to be much more involved.

Signed-off-by: Stephen Finucane <[email protected]>
@stephenfin stephenfin force-pushed the bump-openapi-generator branch from 57024dd to fa3fd85 Compare January 9, 2026 14:36
@yliaog
Copy link
Contributor

yliaog commented Jan 9, 2026

thanks for the PR, i'm in the process of releasing 1.35, could we come back to this PR after 1.35 has been released GA?

@stephenfin
Copy link
Author

thanks for the PR, i'm in the process of releasing 1.35, could we come back to this PR after 1.35 has been released GA?

Yes, no problem. Thanks for letting me know 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. 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