:bug: Restmapper: Respect preferred version by alvaroaleman · Pull Request #3151 · kubernetes-sigs/controller-runtime

alvaroaleman · 2025-03-09T05:08:34Z

When requesting a resource without version through methods such as RESTMapping, the mapper would previously return a random version rather than the preferred one, this change fixes that.

Fixes #3133
/cherrypick release-0.20

pkg/client/apiutil/restmapper.go

erikgb · 2025-03-10T08:23:45Z

pkg/client/apiutil/restmapper.go


 		if !found {
-			groupResources.Group.Versions = append(groupResources.Group.Versions, metav1.GroupVersionForDiscovery{
+			doc := metav1.GroupVersionForDiscovery{


What is doc a short-name for?

Suggested change

doc := metav1.GroupVersionForDiscovery{

gv := metav1.GroupVersionForDiscovery{

Short for GroupVersion. Just a suggestion. A short variable name makes sense here since the scope of the variable is short. Curious to know what doc/document has to do with this. 🤔

stefanprodan

LGTM

I've tested this fix in Flux and the issue with preferred version is gone. Thanks @alvaroaleman 🥇

k8s-ci-robot · 2025-03-12T10:05:05Z

@stefanprodan: changing LGTM is restricted to collaborators

Details

In response to this:

LGTM

I've tested this fix in Flux and the issue with preferred version is gone. Thanks @alvaroaleman 🥇

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 · 2025-03-12T10:05:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, stefanprodan

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [alvaroaleman]

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

sbueringer · 2025-03-13T05:24:06Z

pkg/client/apiutil/restmapper_test.go

+							Kind:  "Driver",
+						})
+						g.Expect(err).NotTo(gmg.HaveOccurred())
+						g.Expect(mapping.GroupVersionKind.Version).To(gmg.Equal("v2"))


Q: Just curious. What makes v2 the preferred version in this test?

Does the apiserver have some logic that prefers v2 over v1?

(maybe worth adding a godoc)

Added a comment

erikgb

Just a minor nit question/comment from me. Otherwise LGTM! Thanks a lot for looking into this!

erikgb · 2025-03-14T19:47:25Z

pkg/client/apiutil/restmapper.go


 		if !found {
-			groupResources.Group.Versions = append(groupResources.Group.Versions, metav1.GroupVersionForDiscovery{
+			doc := metav1.GroupVersionForDiscovery{


Suggested change

doc := metav1.GroupVersionForDiscovery{

gv := metav1.GroupVersionForDiscovery{

Short for GroupVersion. Just a suggestion. A short variable name makes sense here since the scope of the variable is short. Curious to know what doc/document has to do with this. 🤔

When requesting a resource without version through methods such as `RESTMapping`, the mapper would previously return a random version rather than the preferred one, this change fixes that.

erikgb

/lgtm

k8s-ci-robot · 2025-03-15T16:46:20Z

LGTM label has been added.

Details

Git tree hash: ea6e2e638195caece1d1772f211f8ffc66713be6

k8s-infra-cherrypick-robot · 2025-03-15T16:48:24Z

@alvaroaleman: new pull request created: #3159

Details

In response to this:

When requesting a resource without version through methods such as RESTMapping, the mapper would previously return a random version rather than the preferred one, this change fixes that.

Fixes #3133
/cherrypick release-0.20

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.

sbueringer · 2025-03-16T06:10:34Z

/lgtm

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 9, 2025

k8s-ci-robot requested review from FillZpp and joelanford March 9, 2025 05:08

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 9, 2025

alvaroaleman mentioned this pull request Mar 9, 2025

RESTMapper randomly returns API versions #3133

Closed

seh reviewed Mar 9, 2025

View reviewed changes

pkg/client/apiutil/restmapper.go Outdated Show resolved Hide resolved

alvaroaleman force-pushed the fix-prefer branch from 6ebcebe to 2dad16f Compare March 9, 2025 16:07

erikgb reviewed Mar 10, 2025

View reviewed changes

This was referenced Mar 12, 2025

Use RESTMapper with AggregatedDiscovery and preferred version fix fluxcd/pkg#883

Closed

Use RESTMapper with preferred version fix fluxcd/kustomize-controller#1391

Closed

Introduce kstatus watcher helm/helm#13604

Merged

stefanprodan approved these changes Mar 12, 2025

View reviewed changes

sbueringer reviewed Mar 13, 2025

View reviewed changes

erikgb reviewed Mar 14, 2025

View reviewed changes

🐛 Restmapper: Respect preferred version

d724f7f

When requesting a resource without version through methods such as `RESTMapping`, the mapper would previously return a random version rather than the preferred one, this change fixes that.

alvaroaleman force-pushed the fix-prefer branch from 2dad16f to d724f7f Compare March 15, 2025 16:27

erikgb reviewed Mar 15, 2025

View reviewed changes

k8s-ci-robot assigned erikgb Mar 15, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2025

k8s-ci-robot merged commit 183de45 into kubernetes-sigs:main Mar 15, 2025
9 checks passed

k8s-infra-cherrypick-robot mentioned this pull request Mar 15, 2025

[release-0.20] 🐛 Restmapper: Respect preferred version #3159

Merged

	doc := metav1.GroupVersionForDiscovery{
	gv := metav1.GroupVersionForDiscovery{

Comments

Conversation

alvaroaleman commented Mar 9, 2025

Uh oh!

Uh oh!

erikgb Mar 10, 2025

Choose a reason for hiding this comment

Uh oh!

alvaroaleman Mar 11, 2025

Choose a reason for hiding this comment

Uh oh!

erikgb Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

stefanprodan left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Mar 12, 2025

Uh oh!

k8s-ci-robot commented Mar 12, 2025

Uh oh!

sbueringer Mar 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alvaroaleman Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

erikgb left a comment

Choose a reason for hiding this comment

Uh oh!

erikgb Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

erikgb left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Mar 15, 2025

Uh oh!

Uh oh!

k8s-infra-cherrypick-robot commented Mar 15, 2025

Uh oh!

sbueringer commented Mar 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

sbueringer Mar 13, 2025 •

edited

Loading