🐛 Only try to convert infraRefs if they are set

[sbueringer]

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:

I noticed the following errors in v0.3 => and v0.4 => upgrade tests:

E0825 18:05:01.890564 1 conversion.go:74] "failed to convert" err="failed to convert object: failed to get apiVersion for kind : failed to get CustomResourceDefinition metadata: CustomResourceDefinition.apiextensions.k8s.io "." not found" logger="conversion-webhook" request="28fca41f-db58-429b-93eb-6a6fbce2564c"
I0825 18:05:01.897137 1 recorder.go:104] "Failed to update MachineSet clusterctl-upgrade/clusterctl-upgrade-workload-qdpc77-md-0-578956d7b6: failed to apply MachineSet clusterctl-upgrade/clusterctl-upgrade-workload-qdpc77-md-0-578956d7b6: failed to prune fields: failed add back owned items: failed to convert pruned object at version cluster.x-k8s.io/v1beta1: conversion webhook for cluster.x-k8s.io/v1beta2, Kind=MachineSet failed: failed to convert object: failed to get apiVersion for kind : failed to get CustomResourceDefinition metadata: CustomResourceDefinition.apiextensions.k8s.io "." not found" logger="events" type="Warning" object={"kind":"MachineDeployment","namespace":"clusterctl-upgrade","name":"clusterctl-upgrade-workload-qdpc77-md-0","uid":"56a54e62-9be5-4e1d-8d83-d7abbf76cc76","apiVersion":"cluster.x-k8s.io/v1beta2","resourceVersion":"4425"} reason="FailedUpdate"
E0825 18:05:02.025429 1 controller.go:353] "Reconciler error" err="failed to update MachineSet clusterctl-upgrade/clusterctl-upgrade-workload-qdpc77-md-0-578956d7b6: failed to apply MachineSet clusterctl-upgrade/clusterctl-upgrade-workload-qdpc77-md-0-578956d7b6: failed to prune fields: failed add back owned items: failed to convert pruned object at version cluster.x-k8s.io/v1beta1: conversion webhook for cluster.x-k8s.io/v1beta2, Kind=MachineSet failed: failed to convert object: failed to get apiVersion for kind : failed to get CustomResourceDefinition metadata: CustomResourceDefinition.apiextensions.k8s.io "." not found" controller="machinedeployment" controllerGroup="cluster.x-k8s.io" controllerKind="MachineDeployment" MachineDeployment="clusterctl-upgrade/clusterctl-upgrade-workload-qdpc77-md-0" namespace="clusterctl-upgrade" name="clusterctl-upgrade-workload-qdpc77-md-0" reconcileID="97c28cf4-2b26-45a1-8743-0eb23fecd4a4"

See:

• https://storage.googleapis.com/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api/12676/pull-cluster-api-e2e-main/1960033185500762112/artifacts/clusters/clusterctl-upgrade-management-gffxlp/logs/capi-system/capi-controller-manager/capi-controller-manager-5d7bdb7fdd-4z6dw/manager.log
• https://storage.googleapis.com/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api/12676/pull-cluster-api-e2e-main/1960033185500762112/artifacts/clusters/clusterctl-upgrade-management-z9gsvz/logs/capi-system/capi-controller-manager/capi-controller-manager-7c5cdd7cdc-w2qs5/manager.log

I think the problem is that we are always trying to convert infraRefs, even if they are not set. So this PR fixes that.

I think in general the apiserver only hits this code path on Kubernetes < v1.29. See: kubernetes/kubernetes#117356
(we only use kube-apiservers older than that in the v0.3 and v0.4 upgrade tests)

Independent of that we should fix the conversion for cases where infraRef is not set

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

[sbueringer]

/test pull-cluster-api-e2e-main

[sbueringer]

/assign @fabriziopandini @chrischdi

[fabriziopandini]

Nice catch!
/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 97cb7da08185b9a5658c3c29a3b8c81955e47e2b

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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:

• OWNERS [fabriziopandini]

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

[sbueringer]

/cherry-pick release-1.11

[k8s-infra-cherrypick-robot]

@sbueringer: new pull request created: #12693

In response to this:

/cherry-pick release-1.11

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.