🐛 fix: ensure correct APIVersion in AWSClusterControllerIdentity conversion #5738
+220
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sion The conversion webhook for AWSClusterControllerIdentity was failing with: - expected infrastructure.cluster.x-k8s.io/v1beta2, received infrastructure.cluster.x-k8s.io/v1beta1 - Error from server: conversion webhook returned invalid object: invalid groupVersion Root cause: The auto-generated conversion function (Convert_v1beta1_AWSClusterControllerIdentity_To_v1beta2_AWSClusterControllerIdentity) copies TypeMeta directly from the source object, which includes the APIVersion field. This results in the converted v1beta2 object retaining the v1beta1 APIVersion, causing the conversion webhook to reject it as invalid. Fix: Explicitly set the APIVersion to the target version (v1beta2) after calling the auto-generated conversion function in both ConvertTo methods for AWSClusterControllerIdentity and AWSClusterControllerIdentityList. This ensures the converted object has the correct APIVersion that matches the target API version expected by Kubernetes. This fix ensures that when Kubernetes requests conversion from v1beta1 to v1beta2, the webhook returns objects with the correct APIVersion, allowing the conversion to succeed.
k8s-ci-robot
added
kind/bug
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
dntosas
changed the title
k8s-ci-robot
added
size/S
dntosas
changed the title
dntosas
changed the title
k8s-ci-robot
added
size/L
dntosas
force-pushed
the
fix/conversion-awsclustercontroller
branch
from
0a62f61 to
9e21452
Compare
Add comprehensive e2e tests to verify the conversion webhook fix for AWSClusterControllerIdentity. The tests verify: 1. Basic conversion test: - Creates AWSClusterControllerIdentity in v1beta1 format using kubectl - Verifies the resource can be retrieved and has correct v1beta2 APIVersion - Tests both kubectl get and Go client retrieval - Verifies list operations work correctly 2. Provider upgrade simulation test: - Simulates creating resource with old provider (v1beta1) - Simulates provider upgrade scenario - Verifies conversion webhook correctly converts v1beta1 to v1beta2 - Verifies resource spec is preserved during conversion - Tests both kubectl and Go client access patterns These tests ensure that the conversion webhook fix properly handles the APIVersion field during conversion, preventing the error: 'expected infrastructure.cluster.x-k8s.io/v1beta2, received infrastructure.cluster.x-k8s.io/v1beta1' Signed-off-by: dntosas <[email protected]>
dntosas
force-pushed
the
fix/conversion-awsclustercontroller
branch
from
9e21452 to
8b13926
Compare
Contributor
|
@dntosas: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. I understand the commands that are listed here. |
Member
|
/close in favour of #5739 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
/kind bug
The conversion webhook for AWSClusterControllerIdentity was failing with:
Root cause:
The auto-generated conversion function (Convert_v1beta1_AWSClusterControllerIdentity_To_v1beta2_AWSClusterControllerIdentity) copies TypeMeta directly from the source object, which includes the APIVersion field. This results in the converted v1beta2 object retaining the v1beta1 APIVersion, causing the conversion webhook to reject it as invalid.
Fix:
Explicitly set the APIVersion to the target version (v1beta2) after calling the auto-generated conversion function in both ConvertTo methods for AWSClusterControllerIdentity and AWSClusterControllerIdentityList. This ensures the converted object has the correct APIVersion that matches the target API version expected by Kubernetes.
This fix ensures that when Kubernetes requests conversion from v1beta1 to v1beta2, the webhook returns objects with the correct APIVersion, allowing the conversion to succeed.
What type of PR is this?
What this PR does / why we need it:
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 #
Special notes for your reviewer:
Checklist:
Release note: